From f1c82ecd2831963bfef9386a5f2cca1b65483b68 Mon Sep 17 00:00:00 2001
From: Nav <nav@navnav.me>
Date: Tue, 13 Aug 2024 19:54:05 +0100
Subject: [PATCH] Made `key` and `name` attributes optional in
 `register-group-instance` TDF elements Also removed the attribute from all
 instances of the element, where it wasn't necessary.

---
 .../Services/ValidationService.php            | 121 +++++--------
 .../Services/Xml/ToXmlService.php             |  10 +-
 .../TargetDescriptionFile.php                 |  29 ++--
 .../RegisterGroupInstance.hpp                 |   8 +-
 .../TargetDescriptionFile.cpp                 |   9 +-
 .../AVR8/D-SERIES/AVR128DA28.xml              |  90 +++++-----
 .../AVR8/D-SERIES/AVR128DA32.xml              |  92 +++++-----
 .../AVR8/D-SERIES/AVR128DA48.xml              | 110 ++++++------
 .../AVR8/D-SERIES/AVR128DA64.xml              | 120 ++++++-------
 .../AVR8/D-SERIES/AVR128DB28.xml              |  94 +++++-----
 .../AVR8/D-SERIES/AVR128DB32.xml              |  96 +++++------
 .../AVR8/D-SERIES/AVR128DB48.xml              | 116 ++++++-------
 .../AVR8/D-SERIES/AVR128DB64.xml              | 124 +++++++-------
 .../AVR8/D-SERIES/AVR16DD14.xml               |  84 ++++-----
 .../AVR8/D-SERIES/AVR16DD20.xml               |  84 ++++-----
 .../AVR8/D-SERIES/AVR16DD28.xml               |  84 ++++-----
 .../AVR8/D-SERIES/AVR16DD32.xml               |  84 ++++-----
 .../AVR8/D-SERIES/AVR32DA28.xml               |  90 +++++-----
 .../AVR8/D-SERIES/AVR32DA32.xml               |  92 +++++-----
 .../AVR8/D-SERIES/AVR32DA48.xml               | 110 ++++++------
 .../AVR8/D-SERIES/AVR32DB28.xml               |  94 +++++-----
 .../AVR8/D-SERIES/AVR32DB32.xml               |  96 +++++------
 .../AVR8/D-SERIES/AVR32DB48.xml               | 116 ++++++-------
 .../AVR8/D-SERIES/AVR32DD14.xml               |  84 ++++-----
 .../AVR8/D-SERIES/AVR32DD20.xml               |  84 ++++-----
 .../AVR8/D-SERIES/AVR32DD28.xml               |  84 ++++-----
 .../AVR8/D-SERIES/AVR32DD32.xml               |  84 ++++-----
 .../AVR8/D-SERIES/AVR64DA28.xml               |  90 +++++-----
 .../AVR8/D-SERIES/AVR64DA32.xml               |  92 +++++-----
 .../AVR8/D-SERIES/AVR64DA48.xml               | 110 ++++++------
 .../AVR8/D-SERIES/AVR64DA64.xml               | 120 ++++++-------
 .../AVR8/D-SERIES/AVR64DB28.xml               |  94 +++++-----
 .../AVR8/D-SERIES/AVR64DB32.xml               |  96 +++++------
 .../AVR8/D-SERIES/AVR64DB48.xml               | 116 ++++++-------
 .../AVR8/D-SERIES/AVR64DB64.xml               | 124 +++++++-------
 .../AVR8/D-SERIES/AVR64DD14.xml               |  84 ++++-----
 .../AVR8/D-SERIES/AVR64DD20.xml               |  84 ++++-----
 .../AVR8/D-SERIES/AVR64DD28.xml               |  84 ++++-----
 .../AVR8/D-SERIES/AVR64DD32.xml               |  84 ++++-----
 .../AVR8/E-SERIES/AVR64EA28.xml               |  82 ++++-----
 .../AVR8/E-SERIES/AVR64EA32.xml               |  82 ++++-----
 .../AVR8/E-SERIES/AVR64EA48.xml               |  94 +++++-----
 .../AVR8/MEGA/AT90CAN128.xml                  |  52 +++---
 .../AVR8/MEGA/AT90CAN32.xml                   |  52 +++---
 .../AVR8/MEGA/AT90CAN64.xml                   |  52 +++---
 .../AVR8/MEGA/AT90PWM1.xml                    |  36 ++--
 .../AVR8/MEGA/AT90PWM161.xml                  |  34 ++--
 .../AVR8/MEGA/AT90PWM216.xml                  |  40 ++---
 .../AVR8/MEGA/AT90PWM2B.xml                   |  40 ++---
 .../AVR8/MEGA/AT90PWM316.xml                  |  44 ++---
 .../AVR8/MEGA/AT90PWM3B.xml                   |  44 ++---
 .../AVR8/MEGA/AT90PWM81.xml                   |  34 ++--
 .../AVR8/MEGA/AT90USB1286.xml                 |  52 +++---
 .../AVR8/MEGA/AT90USB1287.xml                 |  54 +++---
 .../AVR8/MEGA/AT90USB162.xml                  |  36 ++--
 .../AVR8/MEGA/AT90USB646.xml                  |  54 +++---
 .../AVR8/MEGA/AT90USB647.xml                  |  54 +++---
 .../AVR8/MEGA/AT90USB82.xml                   |  36 ++--
 .../AVR8/MEGA/ATMEGA128.xml                   |  52 +++---
 .../AVR8/MEGA/ATMEGA1280.xml                  |  66 ++++----
 .../AVR8/MEGA/ATMEGA1281.xml                  |  54 +++---
 .../AVR8/MEGA/ATMEGA1284.xml                  |  44 ++---
 .../AVR8/MEGA/ATMEGA1284P.xml                 |  44 ++---
 .../AVR8/MEGA/ATMEGA1284RFR2.xml              |  62 +++----
 .../AVR8/MEGA/ATMEGA128A.xml                  |  52 +++---
 .../AVR8/MEGA/ATMEGA128RFA1.xml               |  62 +++----
 .../AVR8/MEGA/ATMEGA128RFR2.xml               |  62 +++----
 .../AVR8/MEGA/ATMEGA16.xml                    |  40 ++---
 .../AVR8/MEGA/ATMEGA1608.xml                  |  82 ++++-----
 .../AVR8/MEGA/ATMEGA1609.xml                  |  90 +++++-----
 .../AVR8/MEGA/ATMEGA162.xml                   |  42 ++---
 .../AVR8/MEGA/ATMEGA164A.xml                  |  42 ++---
 .../AVR8/MEGA/ATMEGA164P.xml                  |  42 ++---
 .../AVR8/MEGA/ATMEGA164PA.xml                 |  42 ++---
 .../AVR8/MEGA/ATMEGA165A.xml                  |  46 ++---
 .../AVR8/MEGA/ATMEGA165P.xml                  |  46 ++---
 .../AVR8/MEGA/ATMEGA165PA.xml                 |  46 ++---
 .../AVR8/MEGA/ATMEGA168.xml                   |  34 ++--
 .../AVR8/MEGA/ATMEGA168A.xml                  |  34 ++--
 .../AVR8/MEGA/ATMEGA168P.xml                  |  34 ++--
 .../AVR8/MEGA/ATMEGA168PA.xml                 |  34 ++--
 .../AVR8/MEGA/ATMEGA168PB.xml                 |  38 ++---
 .../AVR8/MEGA/ATMEGA169A.xml                  |  48 +++---
 .../AVR8/MEGA/ATMEGA169P.xml                  |  48 +++---
 .../AVR8/MEGA/ATMEGA169PA.xml                 |  48 +++---
 .../AVR8/MEGA/ATMEGA16A.xml                   |  40 ++---
 .../AVR8/MEGA/ATMEGA16M1.xml                  |  38 ++---
 .../AVR8/MEGA/ATMEGA16U2.xml                  |  34 ++--
 .../AVR8/MEGA/ATMEGA16U4.xml                  |  48 +++---
 .../AVR8/MEGA/ATMEGA2560.xml                  |  66 ++++----
 .../AVR8/MEGA/ATMEGA2561.xml                  |  54 +++---
 .../AVR8/MEGA/ATMEGA2564RFR2.xml              |  62 +++----
 .../AVR8/MEGA/ATMEGA256RFR2.xml               |  62 +++----
 .../AVR8/MEGA/ATMEGA32.xml                    |  40 ++---
 .../AVR8/MEGA/ATMEGA3208.xml                  |  82 ++++-----
 .../AVR8/MEGA/ATMEGA3209.xml                  |  90 +++++-----
 .../AVR8/MEGA/ATMEGA324A.xml                  |  42 ++---
 .../AVR8/MEGA/ATMEGA324P.xml                  |  42 ++---
 .../AVR8/MEGA/ATMEGA324PA.xml                 |  42 ++---
 .../AVR8/MEGA/ATMEGA324PB.xml                 |  54 +++---
 .../AVR8/MEGA/ATMEGA325.xml                   |  46 ++---
 .../AVR8/MEGA/ATMEGA3250.xml                  |  50 +++---
 .../AVR8/MEGA/ATMEGA3250A.xml                 |  50 +++---
 .../AVR8/MEGA/ATMEGA3250P.xml                 |  50 +++---
 .../AVR8/MEGA/ATMEGA3250PA.xml                |  50 +++---
 .../AVR8/MEGA/ATMEGA325A.xml                  |  46 ++---
 .../AVR8/MEGA/ATMEGA325P.xml                  |  46 ++---
 .../AVR8/MEGA/ATMEGA325PA.xml                 |  46 ++---
 .../AVR8/MEGA/ATMEGA328.xml                   |  34 ++--
 .../AVR8/MEGA/ATMEGA328P.xml                  |  34 ++--
 .../AVR8/MEGA/ATMEGA328PB.xml                 |  48 +++---
 .../AVR8/MEGA/ATMEGA329.xml                   |  48 +++---
 .../AVR8/MEGA/ATMEGA3290.xml                  |  52 +++---
 .../AVR8/MEGA/ATMEGA3290A.xml                 |  52 +++---
 .../AVR8/MEGA/ATMEGA3290P.xml                 |  52 +++---
 .../AVR8/MEGA/ATMEGA3290PA.xml                |  52 +++---
 .../AVR8/MEGA/ATMEGA329A.xml                  |  48 +++---
 .../AVR8/MEGA/ATMEGA329P.xml                  |  48 +++---
 .../AVR8/MEGA/ATMEGA329PA.xml                 |  48 +++---
 .../AVR8/MEGA/ATMEGA32A.xml                   |  38 ++---
 .../AVR8/MEGA/ATMEGA32C1.xml                  |  36 ++--
 .../AVR8/MEGA/ATMEGA32M1.xml                  |  38 ++---
 .../AVR8/MEGA/ATMEGA32U2.xml                  |  34 ++--
 .../AVR8/MEGA/ATMEGA32U4.xml                  |  48 +++---
 .../AVR8/MEGA/ATMEGA406.xml                   |  42 ++---
 .../AVR8/MEGA/ATMEGA48.xml                    |  34 ++--
 .../AVR8/MEGA/ATMEGA4808.xml                  |  82 ++++-----
 .../AVR8/MEGA/ATMEGA4809.xml                  |  90 +++++-----
 .../AVR8/MEGA/ATMEGA48A.xml                   |  34 ++--
 .../AVR8/MEGA/ATMEGA48P.xml                   |  34 ++--
 .../AVR8/MEGA/ATMEGA48PA.xml                  |  34 ++--
 .../AVR8/MEGA/ATMEGA48PB.xml                  |  38 ++---
 .../AVR8/MEGA/ATMEGA64.xml                    |  52 +++---
 .../AVR8/MEGA/ATMEGA640.xml                   |  66 ++++----
 .../AVR8/MEGA/ATMEGA644.xml                   |  40 ++---
 .../AVR8/MEGA/ATMEGA644A.xml                  |  42 ++---
 .../AVR8/MEGA/ATMEGA644P.xml                  |  42 ++---
 .../AVR8/MEGA/ATMEGA644PA.xml                 |  42 ++---
 .../AVR8/MEGA/ATMEGA644RFR2.xml               |  62 +++----
 .../AVR8/MEGA/ATMEGA645.xml                   |  46 ++---
 .../AVR8/MEGA/ATMEGA6450.xml                  |  50 +++---
 .../AVR8/MEGA/ATMEGA6450A.xml                 |  50 +++---
 .../AVR8/MEGA/ATMEGA6450P.xml                 |  50 +++---
 .../AVR8/MEGA/ATMEGA645A.xml                  |  46 ++---
 .../AVR8/MEGA/ATMEGA645P.xml                  |  46 ++---
 .../AVR8/MEGA/ATMEGA649.xml                   |  48 +++---
 .../AVR8/MEGA/ATMEGA6490.xml                  |  52 +++---
 .../AVR8/MEGA/ATMEGA6490A.xml                 |  52 +++---
 .../AVR8/MEGA/ATMEGA6490P.xml                 |  52 +++---
 .../AVR8/MEGA/ATMEGA649A.xml                  |  48 +++---
 .../AVR8/MEGA/ATMEGA649P.xml                  |  48 +++---
 .../AVR8/MEGA/ATMEGA64A.xml                   |  52 +++---
 .../AVR8/MEGA/ATMEGA64C1.xml                  |  36 ++--
 .../AVR8/MEGA/ATMEGA64M1.xml                  |  38 ++---
 .../AVR8/MEGA/ATMEGA64RFR2.xml                |  62 +++----
 .../AVR8/MEGA/ATMEGA808.xml                   |  82 ++++-----
 .../AVR8/MEGA/ATMEGA809.xml                   |  90 +++++-----
 .../AVR8/MEGA/ATMEGA88.xml                    |  34 ++--
 .../AVR8/MEGA/ATMEGA88A.xml                   |  34 ++--
 .../AVR8/MEGA/ATMEGA88P.xml                   |  34 ++--
 .../AVR8/MEGA/ATMEGA88PA.xml                  |  34 ++--
 .../AVR8/MEGA/ATMEGA88PB.xml                  |  38 ++---
 .../AVR8/MEGA/ATMEGA8U2.xml                   |  34 ++--
 .../AVR8/TINY/ATTINY13.xml                    |  20 +--
 .../AVR8/TINY/ATTINY13A.xml                   |  20 +--
 .../AVR8/TINY/ATTINY1604.xml                  |  64 +++----
 .../AVR8/TINY/ATTINY1606.xml                  |  66 ++++----
 .../AVR8/TINY/ATTINY1607.xml                  |  66 ++++----
 .../AVR8/TINY/ATTINY1614.xml                  |  80 ++++-----
 .../AVR8/TINY/ATTINY1616.xml                  |  82 ++++-----
 .../AVR8/TINY/ATTINY1617.xml                  |  82 ++++-----
 .../AVR8/TINY/ATTINY1624.xml                  |  68 ++++----
 .../AVR8/TINY/ATTINY1626.xml                  |  70 ++++----
 .../AVR8/TINY/ATTINY1627.xml                  |  70 ++++----
 .../AVR8/TINY/ATTINY1634.xml                  |  34 ++--
 .../AVR8/TINY/ATTINY167.xml                   |  34 ++--
 .../AVR8/TINY/ATTINY202.xml                   |  62 +++----
 .../AVR8/TINY/ATTINY204.xml                   |  64 +++----
 .../AVR8/TINY/ATTINY212.xml                   |  66 ++++----
 .../AVR8/TINY/ATTINY214.xml                   |  68 ++++----
 .../AVR8/TINY/ATTINY2313.xml                  |  28 +--
 .../AVR8/TINY/ATTINY2313A.xml                 |  28 +--
 .../AVR8/TINY/ATTINY24.xml                    |  28 +--
 .../AVR8/TINY/ATTINY24A.xml                   |  28 +--
 .../AVR8/TINY/ATTINY25.xml                    |  26 +--
 .../AVR8/TINY/ATTINY261.xml                   |  28 +--
 .../AVR8/TINY/ATTINY261A.xml                  |  28 +--
 .../AVR8/TINY/ATTINY3216.xml                  |  82 ++++-----
 .../AVR8/TINY/ATTINY3217.xml                  |  82 ++++-----
 .../AVR8/TINY/ATTINY402.xml                   |  62 +++----
 .../AVR8/TINY/ATTINY404.xml                   |  64 +++----
 .../AVR8/TINY/ATTINY406.xml                   |  66 ++++----
 .../AVR8/TINY/ATTINY412.xml                   |  66 ++++----
 .../AVR8/TINY/ATTINY414.xml                   |  68 ++++----
 .../AVR8/TINY/ATTINY416.xml                   |  70 ++++----
 .../AVR8/TINY/ATTINY417.xml                   |  70 ++++----
 .../AVR8/TINY/ATTINY4313.xml                  |  28 +--
 .../AVR8/TINY/ATTINY43U.xml                   |  28 +--
 .../AVR8/TINY/ATTINY44.xml                    |  28 +--
 .../AVR8/TINY/ATTINY441.xml                   |  36 ++--
 .../AVR8/TINY/ATTINY44A.xml                   |  28 +--
 .../AVR8/TINY/ATTINY45.xml                    |  26 +--
 .../AVR8/TINY/ATTINY461.xml                   |  28 +--
 .../AVR8/TINY/ATTINY461A.xml                  |  28 +--
 .../AVR8/TINY/ATTINY48.xml                    |  32 ++--
 .../AVR8/TINY/ATTINY804.xml                   |  64 +++----
 .../AVR8/TINY/ATTINY806.xml                   |  66 ++++----
 .../AVR8/TINY/ATTINY807.xml                   |  66 ++++----
 .../AVR8/TINY/ATTINY814.xml                   |  68 ++++----
 .../AVR8/TINY/ATTINY816.xml                   |  70 ++++----
 .../AVR8/TINY/ATTINY817.xml                   |  70 ++++----
 .../AVR8/TINY/ATTINY828.xml                   |  36 ++--
 .../AVR8/TINY/ATTINY84.xml                    |  28 +--
 .../AVR8/TINY/ATTINY841.xml                   |  36 ++--
 .../AVR8/TINY/ATTINY84A.xml                   |  28 +--
 .../AVR8/TINY/ATTINY85.xml                    |  26 +--
 .../AVR8/TINY/ATTINY861.xml                   |  28 +--
 .../AVR8/TINY/ATTINY861A.xml                  |  28 +--
 .../AVR8/TINY/ATTINY87.xml                    |  34 ++--
 .../AVR8/TINY/ATTINY88.xml                    |  32 ++--
 .../AVR8/XMEGA/ATXMEGA128A1.xml               | 148 ++++++++--------
 .../AVR8/XMEGA/ATXMEGA128A1U.xml              | 160 +++++++++---------
 .../AVR8/XMEGA/ATXMEGA128A3.xml               | 130 +++++++-------
 .../AVR8/XMEGA/ATXMEGA128A3U.xml              | 138 +++++++--------
 .../AVR8/XMEGA/ATXMEGA128A4U.xml              | 114 ++++++-------
 .../AVR8/XMEGA/ATXMEGA128B1.xml               | 104 ++++++------
 .../AVR8/XMEGA/ATXMEGA128B3.xml               |  90 +++++-----
 .../AVR8/XMEGA/ATXMEGA128C3.xml               | 106 ++++++------
 .../AVR8/XMEGA/ATXMEGA128D3.xml               | 108 ++++++------
 .../AVR8/XMEGA/ATXMEGA128D4.xml               |  94 +++++-----
 .../AVR8/XMEGA/ATXMEGA16A4.xml                | 106 ++++++------
 .../AVR8/XMEGA/ATXMEGA16A4U.xml               | 114 ++++++-------
 .../AVR8/XMEGA/ATXMEGA16C4.xml                |  98 +++++------
 .../AVR8/XMEGA/ATXMEGA16D4.xml                |  92 +++++-----
 .../AVR8/XMEGA/ATXMEGA16E5.xml                |  88 +++++-----
 .../AVR8/XMEGA/ATXMEGA192A3.xml               | 130 +++++++-------
 .../AVR8/XMEGA/ATXMEGA192A3U.xml              | 138 +++++++--------
 .../AVR8/XMEGA/ATXMEGA192C3.xml               | 106 ++++++------
 .../AVR8/XMEGA/ATXMEGA192D3.xml               | 108 ++++++------
 .../AVR8/XMEGA/ATXMEGA256A3.xml               | 130 +++++++-------
 .../AVR8/XMEGA/ATXMEGA256A3B.xml              | 126 +++++++-------
 .../AVR8/XMEGA/ATXMEGA256A3BU.xml             | 136 +++++++--------
 .../AVR8/XMEGA/ATXMEGA256A3U.xml              | 138 +++++++--------
 .../AVR8/XMEGA/ATXMEGA256C3.xml               | 106 ++++++------
 .../AVR8/XMEGA/ATXMEGA256D3.xml               | 108 ++++++------
 .../AVR8/XMEGA/ATXMEGA32A4.xml                | 106 ++++++------
 .../AVR8/XMEGA/ATXMEGA32A4U.xml               | 114 ++++++-------
 .../AVR8/XMEGA/ATXMEGA32C3.xml                | 106 ++++++------
 .../AVR8/XMEGA/ATXMEGA32C4.xml                |  98 +++++------
 .../AVR8/XMEGA/ATXMEGA32D3.xml                | 108 ++++++------
 .../AVR8/XMEGA/ATXMEGA32D4.xml                |  92 +++++-----
 .../AVR8/XMEGA/ATXMEGA32E5.xml                |  88 +++++-----
 .../AVR8/XMEGA/ATXMEGA384C3.xml               | 110 ++++++------
 .../AVR8/XMEGA/ATXMEGA384D3.xml               | 106 ++++++------
 .../AVR8/XMEGA/ATXMEGA64A1.xml                | 148 ++++++++--------
 .../AVR8/XMEGA/ATXMEGA64A1U.xml               | 160 +++++++++---------
 .../AVR8/XMEGA/ATXMEGA64A3.xml                | 130 +++++++-------
 .../AVR8/XMEGA/ATXMEGA64A3U.xml               | 138 +++++++--------
 .../AVR8/XMEGA/ATXMEGA64A4U.xml               | 114 ++++++-------
 .../AVR8/XMEGA/ATXMEGA64B1.xml                | 104 ++++++------
 .../AVR8/XMEGA/ATXMEGA64B3.xml                |  90 +++++-----
 .../AVR8/XMEGA/ATXMEGA64C3.xml                | 106 ++++++------
 .../AVR8/XMEGA/ATXMEGA64D3.xml                | 108 ++++++------
 .../AVR8/XMEGA/ATXMEGA64D4.xml                |  94 +++++-----
 .../AVR8/XMEGA/ATXMEGA8E5.xml                 |  88 +++++-----
 265 files changed, 8717 insertions(+), 8742 deletions(-)

diff --git a/build/scripts/Targets/TargetDescriptionFiles/Services/ValidationService.php b/build/scripts/Targets/TargetDescriptionFiles/Services/ValidationService.php
index cd7a2450..bd0aac06 100644
--- a/build/scripts/Targets/TargetDescriptionFiles/Services/ValidationService.php
+++ b/build/scripts/Targets/TargetDescriptionFiles/Services/ValidationService.php
@@ -166,18 +166,9 @@ class ValidationService
 
         if (empty($propertyGroup->key)) {
             $failures[] = 'Missing key';
-        }
 
-        if (!mb_check_encoding((string) $propertyGroup->key, 'ASCII')) {
-            $failures[] = 'Key contains non ASCII characters';
-        }
-
-        if (str_contains((string) $propertyGroup->key, ' ')) {
-            $failures[] = 'Key contains at least one white character';
-        }
-
-        if (str_contains((string) $propertyGroup->key, '.')) {
-            $failures[] = 'Key contains at least one period (".") character';
+        } else {
+            $failures = array_merge($failures, $this->validateKey($propertyGroup->key));
         }
 
         if (empty($propertyGroup->subPropertyGroups) && empty($propertyGroup->properties)) {
@@ -219,18 +210,9 @@ class ValidationService
 
         if (empty($property->key)) {
             $failures[] = 'Missing key';
-        }
 
-        if (!mb_check_encoding((string) $property->key, 'ASCII')) {
-            $failures[] = 'Key contains non ASCII characters';
-        }
-
-        if (str_contains((string) $property->key, ' ')) {
-            $failures[] = 'Key contains at least white space character';
-        }
-
-        if (str_contains((string) $property->key, '.')) {
-            $failures[] = 'Key contains at least one period (".") character';
+        } else {
+            $failures = array_merge($failures, $this->validateKey($property->key));
         }
 
         if ($property->value === null) {
@@ -312,14 +294,9 @@ class ValidationService
 
         if (empty($segment->key)) {
             $failures[] = 'Missing key';
-        }
 
-        if (!preg_match('/^[a-z_]+$/',$segment->key)) {
-            $failures[] = 'Key must contain only lowercase letters';
-        }
-
-        if (!mb_check_encoding((string) $segment->key, 'ASCII')) {
-            $failures[] = 'Key must contain only ASCII characters';
+        } else {
+            $failures = array_merge($failures, $this->validateKey($segment->key));
         }
 
         if (empty($segment->name)) {
@@ -445,18 +422,9 @@ class ValidationService
 
         if (empty($registerGroup->key)) {
             $failures[] = 'Missing key';
-        }
 
-        if (!mb_check_encoding((string) $registerGroup->key, 'ASCII')) {
-            $failures[] = 'Key contains non ASCII characters';
-        }
-
-        if (str_contains((string) $registerGroup->key, ' ')) {
-            $failures[] = 'Key contains at least one white character';
-        }
-
-        if (str_contains((string) $registerGroup->key, '.')) {
-            $failures[] = 'Key contains at least one period (".") character';
+        } else {
+            $failures = array_merge($failures, $this->validateKey($registerGroup->key));
         }
 
         if (empty($registerGroup->name)) {
@@ -534,18 +502,9 @@ class ValidationService
 
         if (empty($registerGroupReference->key)) {
             $failures[] = 'Missing key';
-        }
 
-        if (!mb_check_encoding((string) $registerGroupReference->key, 'ASCII')) {
-            $failures[] = 'Key contains non ASCII characters';
-        }
-
-        if (str_contains((string) $registerGroupReference->key, ' ')) {
-            $failures[] = 'Key contains at least one period space';
-        }
-
-        if (str_contains((string) $registerGroupReference->key, '.')) {
-            $failures[] = 'Key contains at least one period (".") character';
+        } else {
+            $failures = array_merge($failures, $this->validateKey($registerGroupReference->key));
         }
 
         if (empty($registerGroupReference->registerGroupKey)) {
@@ -581,18 +540,9 @@ class ValidationService
 
         if (empty($register->key)) {
             $failures[] = 'Missing key';
-        }
 
-        if (!mb_check_encoding((string) $register->key, 'ASCII')) {
-            $failures[] = 'Key contains non ASCII character';
-        }
-
-        if (str_contains((string) $register->key, ' ')) {
-            $failures[] = 'Key contains at least white space character';
-        }
-
-        if (str_contains((string) $register->key, '.')) {
-            $failures[] = 'Key contains at least one period (".") character';
+        } else {
+            $failures = array_merge($failures, $this->validateKey($register->key));
         }
 
         if (empty($register->name)) {
@@ -750,30 +700,14 @@ class ValidationService
     ): array {
         $failures = [];
 
-        if (empty($registerGroupInstance->key)) {
-            $failures[] = 'Missing key';
-        }
-
-        if (!mb_check_encoding((string) $registerGroupInstance->key, 'ASCII')) {
-            $failures[] = 'Key contains non ASCII characters';
-        }
-
-        if (str_contains((string) $registerGroupInstance->key, ' ')) {
-            $failures[] = 'Key contains at least one period space';
-        }
-
-        if (str_contains((string) $registerGroupInstance->key, '.')) {
-            $failures[] = 'Key contains at least one period (".") character';
+        if (!empty($registerGroupInstance->key)) {
+            $failures = array_merge($failures, $this->validateKey($registerGroupInstance->key));
         }
 
         if (empty($registerGroupInstance->registerGroupKey)) {
             $failures[] = 'Missing register group key';
         }
 
-        if (empty($registerGroupInstance->name)) {
-            $failures[] = 'Missing name';
-        }
-
         if ($registerGroupInstance->offset === null) {
             $failures[] = 'Missing offset';
 
@@ -978,4 +912,31 @@ class ValidationService
             $failures
         );
     }
+
+    protected function validateKey(string $key): array
+    {
+        $failures = [];
+
+        if (!mb_check_encoding($key, 'ASCII')) {
+            $failures[] = 'Key contains non ASCII characters';
+        }
+
+        if (strtolower($key) !== $key) {
+            $failures[] = 'Key must contain only lowercase characters';
+        }
+
+        if (str_contains($key, ' ')) {
+            $failures[] = 'Key contains at least one whitespace';
+        }
+
+        if (str_contains($key, '.')) {
+            $failures[] = 'Key contains at least one period (".") character';
+        }
+
+        return array_map(
+            fn (string $failure): string => 'Key validation failure for key "' . $key
+                . '": ' . $failure,
+            $failures
+        );
+    }
 }
diff --git a/build/scripts/Targets/TargetDescriptionFiles/Services/Xml/ToXmlService.php b/build/scripts/Targets/TargetDescriptionFiles/Services/Xml/ToXmlService.php
index 5c23b472..0dcb9519 100644
--- a/build/scripts/Targets/TargetDescriptionFiles/Services/Xml/ToXmlService.php
+++ b/build/scripts/Targets/TargetDescriptionFiles/Services/Xml/ToXmlService.php
@@ -162,8 +162,14 @@ class ToXmlService
         DOMDocument $document
     ): DOMElement {
         $element = $document->createElement('register-group-instance');
-        $element->setAttribute('key', $registerGroupInstance->key);
-        $element->setAttribute('name', $registerGroupInstance->name);
+
+        if (!empty($registerGroupInstance->key)) {
+            $element->setAttribute('key', $registerGroupInstance->key);
+        }
+
+        if (!empty($registerGroupInstance->name)) {
+            $element->setAttribute('name', $registerGroupInstance->name);
+        }
 
         if (!empty($registerGroupInstance->description)) {
             $element->setAttribute('description', $registerGroupInstance->description);
diff --git a/build/scripts/Targets/TargetDescriptionFiles/TargetDescriptionFile.php b/build/scripts/Targets/TargetDescriptionFiles/TargetDescriptionFile.php
index 9713df03..0fe6b594 100644
--- a/build/scripts/Targets/TargetDescriptionFiles/TargetDescriptionFile.php
+++ b/build/scripts/Targets/TargetDescriptionFiles/TargetDescriptionFile.php
@@ -317,12 +317,12 @@ class TargetDescriptionFile
             $registerGroup = $this->resolveRegisterGroupInstance($registerGroupInstance, $peripheral->moduleKey);
             if ($registerGroup instanceof RegisterGroup) {
                 $output->registerGroups[] = $this->targetRegisterGroupFromRegisterGroup(
-                    $registerGroupInstance->key,
-                    $registerGroupInstance->name,
                     $registerGroupInstance->addressSpaceKey,
                     $registerGroup,
                     $registerGroupInstance->offset ?? 0,
-                    $peripheral->moduleKey
+                    $peripheral->moduleKey,
+                    $registerGroupInstance->key,
+                    $registerGroupInstance->name
                 );
             }
         }
@@ -331,20 +331,25 @@ class TargetDescriptionFile
     }
 
     private function targetRegisterGroupFromRegisterGroup(
-        string $key,
-        string $name,
         string $addressSpaceKey,
         RegisterGroup $registerGroup,
         int $addressOffset,
-        string $moduleKey
+        string $moduleKey,
+        ?string $keyOverride = null,
+        ?string $nameOverride = null
     ): TargetRegisterGroup {
         $addressOffset += $registerGroup->offset ?? 0;
-        $output = new TargetRegisterGroup($key, $name, $addressSpaceKey, $addressOffset, [], []);
+        $output = new TargetRegisterGroup(
+            $keyOverride ?? $registerGroup->key,
+            $nameOverride ?? $registerGroup->name,
+            $addressSpaceKey,
+            $addressOffset,
+            [],
+            []
+        );
 
         foreach ($registerGroup->subgroups as $subgroup) {
             $output->subgroups[] = $this->targetRegisterGroupFromRegisterGroup(
-                $subgroup->key,
-                $subgroup->name,
                 $addressSpaceKey,
                 $subgroup,
                 $addressOffset,
@@ -357,12 +362,12 @@ class TargetDescriptionFile
 
             if ($subgroup instanceof RegisterGroup) {
                 $output->subgroups[] = $this->targetRegisterGroupFromRegisterGroup(
-                    $subgroupReference->key,
-                    $subgroupReference->name,
                     $addressSpaceKey,
                     $subgroup,
                     $addressOffset + $subgroupReference->offset,
-                    $moduleKey
+                    $moduleKey,
+                    $subgroupReference->key,
+                    $subgroupReference->name
                 );
             }
         }
diff --git a/src/Targets/TargetDescription/RegisterGroupInstance.hpp b/src/Targets/TargetDescription/RegisterGroupInstance.hpp
index 88468040..781a4d50 100644
--- a/src/Targets/TargetDescription/RegisterGroupInstance.hpp
+++ b/src/Targets/TargetDescription/RegisterGroupInstance.hpp
@@ -8,16 +8,16 @@ namespace Targets::TargetDescription
 {
     struct RegisterGroupInstance
     {
-        std::string key;
-        std::string name;
+        std::optional<std::string> key;
+        std::optional<std::string> name;
         std::string registerGroupKey;
         std::string addressSpaceKey;
         std::uint32_t offset;
         std::optional<std::string> description;
 
         RegisterGroupInstance(
-            const std::string& key,
-            const std::string& name,
+            const std::optional<std::string>& key,
+            const std::optional<std::string>& name,
             const std::string& registerGroupKey,
             const std::string& addressSpaceKey,
             std::uint32_t offset,
diff --git a/src/Targets/TargetDescription/TargetDescriptionFile.cpp b/src/Targets/TargetDescription/TargetDescriptionFile.cpp
index a73cb85e..7a380bfb 100644
--- a/src/Targets/TargetDescription/TargetDescriptionFile.cpp
+++ b/src/Targets/TargetDescription/TargetDescriptionFile.cpp
@@ -774,7 +774,10 @@ namespace Targets::TargetDescription
             element = element.nextSiblingElement("register-group-instance")
         ) {
             auto registerGroupInstance = TargetDescriptionFile::registerGroupInstanceFromXml(element);
-            output.registerGroupInstancesByKey.emplace(registerGroupInstance.key, std::move(registerGroupInstance));
+            output.registerGroupInstancesByKey.emplace(
+                registerGroupInstance.key.value_or(registerGroupInstance.registerGroupKey),
+                std::move(registerGroupInstance)
+            );
         }
 
         for (
@@ -790,8 +793,8 @@ namespace Targets::TargetDescription
 
     RegisterGroupInstance TargetDescriptionFile::registerGroupInstanceFromXml(const QDomElement& xmlElement) {
         return {
-            TargetDescriptionFile::getAttribute(xmlElement, "key"),
-            TargetDescriptionFile::getAttribute(xmlElement, "name"),
+            TargetDescriptionFile::tryGetAttribute(xmlElement, "key"),
+            TargetDescriptionFile::tryGetAttribute(xmlElement, "name"),
             TargetDescriptionFile::getAttribute(xmlElement, "register-group-key"),
             TargetDescriptionFile::getAttribute(xmlElement, "address-space-key"),
             StringService::toUint32(TargetDescriptionFile::getAttribute(xmlElement, "offset")),
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA28.xml
index ddccdd4a..05e5ba33 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA28.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC0" group="N"/>
@@ -53,7 +53,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
-            <register-group-instance key="ac1" name="AC1" register-group-key="ac" address-space-key="data" offset="0x688"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x688"/>
             <signals>
                 <signal pad-id="pd5" index="0" function="AC1" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC1" group="N"/>
@@ -66,7 +66,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
-            <register-group-instance key="ac2" name="AC2" register-group-key="ac" address-space-key="data" offset="0x690"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x690"/>
             <signals>
                 <signal pad-id="pd7" index="0" function="AC2" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC2" group="N"/>
@@ -78,7 +78,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
@@ -93,10 +93,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
@@ -117,7 +117,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrda_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKOUT"/>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
@@ -126,22 +126,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrda_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -151,19 +151,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrda_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="avrda_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="avrda_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -176,7 +176,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -185,7 +185,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
@@ -198,7 +198,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -206,7 +206,7 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrda_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="adc_ptc_ctrl_v1">
             <signals>
@@ -231,22 +231,22 @@
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="avrda_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_v1">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -255,7 +255,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
-            <register-group-instance key="spi1" name="SPI1" register-group-key="spi" address-space-key="data" offset="0x960"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x960"/>
             <signals>
                 <signal pad-id="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
                 <signal pad-id="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
@@ -264,10 +264,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrda_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pd0" index="0" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -290,25 +290,25 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
@@ -319,7 +319,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -332,7 +332,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -345,7 +345,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -354,35 +354,35 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
-            <register-group-instance key="usart2" name="USART2" register-group-key="usart" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
                 <signal pad-id="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrda_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="avrda_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd0" name="ZCD0" register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
             <signals>
                 <signal pad-id="pd1" function="ZCD0" group="IN"/>
                 <signal pad-id="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA32.xml
index d8d4151a..d99b1b71 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA32.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC0" group="N"/>
@@ -53,7 +53,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
-            <register-group-instance key="ac1" name="AC1" register-group-key="ac" address-space-key="data" offset="0x688"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x688"/>
             <signals>
                 <signal pad-id="pd5" index="0" function="AC1" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC1" group="N"/>
@@ -66,7 +66,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
-            <register-group-instance key="ac2" name="AC2" register-group-key="ac" address-space-key="data" offset="0x690"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x690"/>
             <signals>
                 <signal pad-id="pd7" index="0" function="AC2" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC2" group="N"/>
@@ -78,7 +78,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
@@ -97,10 +97,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
@@ -123,7 +123,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrda_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKOUT"/>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
@@ -132,22 +132,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrda_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -158,19 +158,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrda_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="avrda_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="avrda_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -183,7 +183,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -192,7 +192,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
@@ -205,7 +205,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -217,7 +217,7 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrda_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="adc_ptc_ctrl_v1">
             <signals>
@@ -246,22 +246,22 @@
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="avrda_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_v1">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -270,7 +270,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
-            <register-group-instance key="spi1" name="SPI1" register-group-key="spi" address-space-key="data" offset="0x960"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x960"/>
             <signals>
                 <signal pad-id="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
                 <signal pad-id="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
@@ -279,10 +279,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrda_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pd0" index="0" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -309,27 +309,27 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
@@ -342,7 +342,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -355,7 +355,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi1" name="TWI1" register-group-key="twi" address-space-key="data" offset="0x920"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x920"/>
             <signals>
                 <signal pad-id="pf3" function="I2C1_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
                 <signal pad-id="pf3" function="I2C1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
@@ -364,7 +364,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -377,7 +377,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -386,7 +386,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
-            <register-group-instance key="usart2" name="USART2" register-group-key="usart" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
                 <signal pad-id="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
@@ -397,28 +397,28 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrda_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="avrda_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd0" name="ZCD0" register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
             <signals>
                 <signal pad-id="pd1" function="ZCD0" group="IN"/>
                 <signal pad-id="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA48.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA48.xml
index 500d243e..acd32dc6 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA48.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC0" group="N"/>
@@ -56,7 +56,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
-            <register-group-instance key="ac1" name="AC1" register-group-key="ac" address-space-key="data" offset="0x688"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x688"/>
             <signals>
                 <signal pad-id="pd5" index="0" function="AC1" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC1" group="N"/>
@@ -70,7 +70,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
-            <register-group-instance key="ac2" name="AC2" register-group-key="ac" address-space-key="data" offset="0x690"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x690"/>
             <signals>
                 <signal pad-id="pd7" index="0" function="AC2" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC2" group="N"/>
@@ -84,7 +84,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
@@ -107,10 +107,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
@@ -138,7 +138,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrda_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKOUT"/>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
@@ -147,22 +147,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrda_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -176,19 +176,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrda_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="avrda_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="avrda_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -201,7 +201,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -212,7 +212,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -225,7 +225,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
@@ -238,7 +238,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pe1" index="1" function="IOPORT" group="PIN"/>
@@ -247,7 +247,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -259,7 +259,7 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrda_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="adc_ptc_ctrl_v1">
             <signals>
@@ -298,22 +298,22 @@
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="avrda_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_v1">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pe1" function="SPI0_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -326,7 +326,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
-            <register-group-instance key="spi1" name="SPI1" register-group-key="spi" address-space-key="data" offset="0x960"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x960"/>
             <signals>
                 <signal pad-id="pb5" function="SPI1_ALT2" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
                 <signal pad-id="pc5" function="SPI1_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
@@ -341,10 +341,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrda_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pe0" index="0" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -383,7 +383,7 @@
             </signals>
         </peripheral>
         <peripheral key="tca1" name="TCA1" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca1" name="TCA1" register-group-key="tca" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pc4" index="0" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
                 <signal pad-id="pb0" index="0" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
@@ -397,35 +397,35 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
             <signals>
                 <signal pad-id="pb4" index="0" function="TCB2_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcb3" name="TCB3" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb3" name="TCB3" register-group-key="tcb" address-space-key="data" offset="0xB30"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB30"/>
             <signals>
                 <signal pad-id="pc1" index="0" function="TCB3_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
                 <signal pad-id="pb5" index="0" function="TCB3" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pb4" function="TCD0_ALT" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
@@ -440,7 +440,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -457,7 +457,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi1" name="TWI1" register-group-key="twi" address-space-key="data" offset="0x920"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x920"/>
             <signals>
                 <signal pad-id="pb3" function="I2C1_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
                 <signal pad-id="pf3" function="I2C1_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
@@ -470,7 +470,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -483,7 +483,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc5" function="USART1_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -496,7 +496,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
-            <register-group-instance key="usart2" name="USART2" register-group-key="usart" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
                 <signal pad-id="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
@@ -507,7 +507,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="uart_autobd_v4">
-            <register-group-instance key="usart3" name="USART3" register-group-key="usart" address-space-key="data" offset="0x860"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x860"/>
             <signals>
                 <signal pad-id="pb5" function="USART3_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
                 <signal pad-id="pb1" function="USART3" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
@@ -518,7 +518,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart4" name="USART4" module-key="uart_autobd_v4">
-            <register-group-instance key="usart4" name="USART4" register-group-key="usart" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pe1" function="USART4" group="RXD" field="PORTMUX.USARTROUTEB.USART4"/>
                 <signal pad-id="pe0" function="USART4" group="TXD" field="PORTMUX.USARTROUTEB.USART4"/>
@@ -527,34 +527,34 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrda_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vporte" name="VPORTE" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vporte" name="VPORTE" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="avrda_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd0" name="ZCD0" register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
             <signals>
                 <signal pad-id="pd1" function="ZCD0" group="IN"/>
                 <signal pad-id="pc7" function="ZCD0_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
@@ -562,7 +562,7 @@
             </signals>
         </peripheral>
         <peripheral key="zcd1" name="ZCD1" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd1" name="ZCD1" register-group-key="zcd" address-space-key="data" offset="0x6C8"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6C8"/>
             <signals>
                 <signal pad-id="pe3" function="ZCD1" group="IN"/>
                 <signal pad-id="pc7" function="ZCD1_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA64.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA64.xml
index 31dff25f..52f02d0e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA64.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA64.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC0" group="N"/>
@@ -56,7 +56,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
-            <register-group-instance key="ac1" name="AC1" register-group-key="ac" address-space-key="data" offset="0x688"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x688"/>
             <signals>
                 <signal pad-id="pd5" index="0" function="AC1" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC1" group="N"/>
@@ -70,7 +70,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
-            <register-group-instance key="ac2" name="AC2" register-group-key="ac" address-space-key="data" offset="0x690"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x690"/>
             <signals>
                 <signal pad-id="pd7" index="0" function="AC2" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC2" group="N"/>
@@ -84,7 +84,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
@@ -111,10 +111,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
@@ -148,7 +148,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrda_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKOUT"/>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
@@ -157,22 +157,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrda_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -190,19 +190,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrda_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="avrda_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="avrda_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -215,7 +215,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -228,7 +228,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -241,7 +241,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
@@ -254,7 +254,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pe1" index="1" function="IOPORT" group="PIN"/>
@@ -267,7 +267,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -279,7 +279,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" register-group-key="port" address-space-key="data" offset="0x4C0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4C0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pg1" index="1" function="IOPORT" group="PIN"/>
@@ -292,7 +292,7 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrda_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="adc_ptc_ctrl_v1">
             <signals>
@@ -345,22 +345,22 @@
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="avrda_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_v1">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pg5" function="SPI0_ALT2" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pe1" function="SPI0_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -377,7 +377,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
-            <register-group-instance key="spi1" name="SPI1" register-group-key="spi" address-space-key="data" offset="0x960"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x960"/>
             <signals>
                 <signal pad-id="pb5" function="SPI1_ALT2" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
                 <signal pad-id="pc5" function="SPI1_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
@@ -394,10 +394,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrda_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -444,7 +444,7 @@
             </signals>
         </peripheral>
         <peripheral key="tca1" name="TCA1" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca1" name="TCA1" register-group-key="tca" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
                 <signal pad-id="pe4" index="0" function="TCA1_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
@@ -467,42 +467,42 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
             <signals>
                 <signal pad-id="pb4" index="0" function="TCB2_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcb3" name="TCB3" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb3" name="TCB3" register-group-key="tcb" address-space-key="data" offset="0xB30"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB30"/>
             <signals>
                 <signal pad-id="pc1" index="0" function="TCB3_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
                 <signal pad-id="pb5" index="0" function="TCB3" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
             </signals>
         </peripheral>
         <peripheral key="tcb4" name="TCB4" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb4" name="TCB4" register-group-key="tcb" address-space-key="data" offset="0xB40"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB40"/>
             <signals>
                 <signal pad-id="pc6" index="0" function="TCB4_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB4"/>
                 <signal pad-id="pg3" index="0" function="TCB4" group="WO" field="PORTMUX.TCBROUTEA.TCB4"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pg4" function="TCD0_ALT3" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
@@ -523,7 +523,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -540,7 +540,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi1" name="TWI1" register-group-key="twi" address-space-key="data" offset="0x920"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x920"/>
             <signals>
                 <signal pad-id="pb3" function="I2C1_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
                 <signal pad-id="pf3" function="I2C1_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
@@ -557,7 +557,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -570,7 +570,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc5" function="USART1_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -583,7 +583,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
-            <register-group-instance key="usart2" name="USART2" register-group-key="usart" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
                 <signal pad-id="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
@@ -594,7 +594,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="uart_autobd_v4">
-            <register-group-instance key="usart3" name="USART3" register-group-key="usart" address-space-key="data" offset="0x860"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x860"/>
             <signals>
                 <signal pad-id="pb5" function="USART3_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
                 <signal pad-id="pb1" function="USART3" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
@@ -607,7 +607,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart4" name="USART4" module-key="uart_autobd_v4">
-            <register-group-instance key="usart4" name="USART4" register-group-key="usart" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pe5" function="USART4_ALT" group="RXD" field="PORTMUX.USARTROUTEB.USART4"/>
                 <signal pad-id="pe1" function="USART4" group="RXD" field="PORTMUX.USARTROUTEB.USART4"/>
@@ -620,7 +620,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart5" name="USART5" module-key="uart_autobd_v4">
-            <register-group-instance key="usart5" name="USART5" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pg5" function="USART5_ALT" group="RXD" field="PORTMUX.USARTROUTEB.USART5"/>
                 <signal pad-id="pg1" function="USART5" group="RXD" field="PORTMUX.USARTROUTEB.USART5"/>
@@ -633,37 +633,37 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrda_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vporte" name="VPORTE" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vporte" name="VPORTE" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vportg" name="VPORTG" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportg" name="VPORTG" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="avrda_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd0" name="ZCD0" register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
             <signals>
                 <signal pad-id="pd1" function="ZCD0" group="IN"/>
                 <signal pad-id="pc7" function="ZCD0_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
@@ -671,7 +671,7 @@
             </signals>
         </peripheral>
         <peripheral key="zcd1" name="ZCD1" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd1" name="ZCD1" register-group-key="zcd" address-space-key="data" offset="0x6C8"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6C8"/>
             <signals>
                 <signal pad-id="pe3" function="ZCD1" group="IN"/>
                 <signal pad-id="pc7" function="ZCD1_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
@@ -679,7 +679,7 @@
             </signals>
         </peripheral>
         <peripheral key="zcd2" name="ZCD2" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd2" name="ZCD2" register-group-key="zcd" address-space-key="data" offset="0x6D0"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6D0"/>
             <signals>
                 <signal pad-id="pe7" function="ZCD2" group="IN"/>
                 <signal pad-id="pc7" function="ZCD2_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD2"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB28.xml
index f3b4e0e0..c347fe1b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB28.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd7" index="2" function="AC0" group="N"/>
@@ -52,7 +52,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
-            <register-group-instance key="ac1" name="AC1" register-group-key="ac" address-space-key="data" offset="0x688"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x688"/>
             <signals>
                 <signal pad-id="pd5" index="0" function="AC1" group="N"/>
                 <signal pad-id="pd7" index="2" function="AC1" group="N"/>
@@ -64,7 +64,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
-            <register-group-instance key="ac2" name="AC2" register-group-key="ac" address-space-key="data" offset="0x690"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x690"/>
             <signals>
                 <signal pad-id="pd7" index="0" function="AC2" group="N"/>
                 <signal pad-id="pd7" index="2" function="AC2" group="N"/>
@@ -75,7 +75,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
                 <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
@@ -89,10 +89,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
@@ -112,7 +112,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKOUT"/>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
@@ -123,22 +123,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="chip_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -148,22 +148,22 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="chip_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="chip_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="mvio" name="MVIO" module-key="io_multiv_ctrl_avr_v1">
-            <register-group-instance key="mvio" name="MVIO" register-group-key="mvio" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="mvio" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="opamp" name="OPAMP" module-key="amp_opamp_ctrl_avr_v1">
-            <register-group-instance key="opamp" name="OPAMP" register-group-key="opamp" address-space-key="data" offset="0x700"/>
+            <register-group-instance register-group-key="opamp" address-space-key="data" offset="0x700"/>
             <signals>
                 <signal pad-id="pd3" function="OPAMP" group="OP0INN"/>
                 <signal pad-id="pd1" function="OPAMP" group="OP0INP"/>
@@ -174,7 +174,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -187,7 +187,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -196,7 +196,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
@@ -208,7 +208,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -216,25 +216,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="chip_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_avr_v2">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -243,7 +243,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
-            <register-group-instance key="spi1" name="SPI1" register-group-key="spi" address-space-key="data" offset="0x960"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x960"/>
             <signals>
                 <signal pad-id="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
                 <signal pad-id="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
@@ -252,10 +252,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -277,25 +277,25 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
@@ -306,7 +306,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pc3" function="I2C0_ALT" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -315,7 +315,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -328,7 +328,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -337,35 +337,35 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
-            <register-group-instance key="usart2" name="USART2" register-group-key="usart" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
                 <signal pad-id="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="chip_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xB0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd0" name="ZCD0" register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
             <signals>
                 <signal pad-id="pd1" function="ZCD0" group="IN"/>
                 <signal pad-id="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB32.xml
index cda4b63f..80040f1b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB32.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd7" index="2" function="AC0" group="N"/>
@@ -52,7 +52,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
-            <register-group-instance key="ac1" name="AC1" register-group-key="ac" address-space-key="data" offset="0x688"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x688"/>
             <signals>
                 <signal pad-id="pd5" index="0" function="AC1" group="N"/>
                 <signal pad-id="pd7" index="2" function="AC1" group="N"/>
@@ -64,7 +64,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
-            <register-group-instance key="ac2" name="AC2" register-group-key="ac" address-space-key="data" offset="0x690"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x690"/>
             <signals>
                 <signal pad-id="pd7" index="0" function="AC2" group="N"/>
                 <signal pad-id="pd7" index="2" function="AC2" group="N"/>
@@ -75,7 +75,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
                 <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
@@ -93,10 +93,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
@@ -118,7 +118,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKOUT"/>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
@@ -129,22 +129,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="chip_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -155,22 +155,22 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="chip_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="chip_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="mvio" name="MVIO" module-key="io_multiv_ctrl_avr_v1">
-            <register-group-instance key="mvio" name="MVIO" register-group-key="mvio" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="mvio" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="opamp" name="OPAMP" module-key="amp_opamp_ctrl_avr_v1">
-            <register-group-instance key="opamp" name="OPAMP" register-group-key="opamp" address-space-key="data" offset="0x700"/>
+            <register-group-instance register-group-key="opamp" address-space-key="data" offset="0x700"/>
             <signals>
                 <signal pad-id="pd3" function="OPAMP" group="OP0INN"/>
                 <signal pad-id="pd1" function="OPAMP" group="OP0INP"/>
@@ -181,7 +181,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -194,7 +194,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -203,7 +203,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
@@ -215,7 +215,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -227,25 +227,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="chip_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_avr_v2">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -254,7 +254,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
-            <register-group-instance key="spi1" name="SPI1" register-group-key="spi" address-space-key="data" offset="0x960"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x960"/>
             <signals>
                 <signal pad-id="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
                 <signal pad-id="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
@@ -263,10 +263,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -292,27 +292,27 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
@@ -325,7 +325,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pc3" function="I2C0_ALT" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -334,14 +334,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi1" name="TWI1" register-group-key="twi" address-space-key="data" offset="0x920"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x920"/>
             <signals>
                 <signal pad-id="pf3" function="I2C1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
                 <signal pad-id="pf2" function="I2C1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -354,7 +354,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -363,7 +363,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
-            <register-group-instance key="usart2" name="USART2" register-group-key="usart" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
                 <signal pad-id="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
@@ -374,28 +374,28 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="chip_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xB0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd0" name="ZCD0" register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
             <signals>
                 <signal pad-id="pd1" function="ZCD0" group="IN"/>
                 <signal pad-id="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB48.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB48.xml
index ba8077d3..7549d8df 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB48.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC0" group="N"/>
@@ -56,7 +56,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
-            <register-group-instance key="ac1" name="AC1" register-group-key="ac" address-space-key="data" offset="0x688"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x688"/>
             <signals>
                 <signal pad-id="pd5" index="0" function="AC1" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC1" group="N"/>
@@ -70,7 +70,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
-            <register-group-instance key="ac2" name="AC2" register-group-key="ac" address-space-key="data" offset="0x690"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x690"/>
             <signals>
                 <signal pad-id="pd7" index="0" function="AC2" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC2" group="N"/>
@@ -84,7 +84,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
@@ -107,10 +107,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
@@ -138,7 +138,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKOUT"/>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
@@ -149,22 +149,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="chip_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -178,22 +178,22 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="chip_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="chip_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="mvio" name="MVIO" module-key="io_multiv_ctrl_avr_v1">
-            <register-group-instance key="mvio" name="MVIO" register-group-key="mvio" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="mvio" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="opamp" name="OPAMP" module-key="amp_opamp_ctrl_avr_v1">
-            <register-group-instance key="opamp" name="OPAMP" register-group-key="opamp" address-space-key="data" offset="0x700"/>
+            <register-group-instance register-group-key="opamp" address-space-key="data" offset="0x700"/>
             <signals>
                 <signal pad-id="pd3" function="OPAMP" group="OP0INN"/>
                 <signal pad-id="pd1" function="OPAMP" group="OP0INP"/>
@@ -207,7 +207,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -220,7 +220,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -231,7 +231,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -244,7 +244,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
@@ -257,7 +257,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pe1" index="1" function="IOPORT" group="PIN"/>
@@ -266,7 +266,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -278,25 +278,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="chip_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_avr_v2">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pe1" function="SPI0_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -309,7 +309,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
-            <register-group-instance key="spi1" name="SPI1" register-group-key="spi" address-space-key="data" offset="0x960"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x960"/>
             <signals>
                 <signal pad-id="pc5" function="SPI1_ALT2" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
                 <signal pad-id="pb5" function="SPI1_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
@@ -324,10 +324,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pe0" index="0" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -366,7 +366,7 @@
             </signals>
         </peripheral>
         <peripheral key="tca1" name="TCA1" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca1" name="TCA1" register-group-key="tca" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pc4" index="0" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
                 <signal pad-id="pb0" index="0" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
@@ -380,35 +380,35 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
             <signals>
                 <signal pad-id="pb4" index="0" function="TCB2_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcb3" name="TCB3" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb3" name="TCB3" register-group-key="tcb" address-space-key="data" offset="0xB30"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB30"/>
             <signals>
                 <signal pad-id="pc1" index="0" function="TCB3_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
                 <signal pad-id="pb5" index="0" function="TCB3" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pb4" function="TCD0_ALT" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
@@ -423,7 +423,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pc7" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pc3" function="I2C0_ALT" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -434,7 +434,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi1" name="TWI1" register-group-key="twi" address-space-key="data" offset="0x920"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x920"/>
             <signals>
                 <signal pad-id="pb3" function="I2C1_ALT" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
                 <signal pad-id="pf3" function="I2C1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
@@ -443,7 +443,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -456,7 +456,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc5" function="USART1_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -469,7 +469,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
-            <register-group-instance key="usart2" name="USART2" register-group-key="usart" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
                 <signal pad-id="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
@@ -480,7 +480,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="uart_autobd_v4">
-            <register-group-instance key="usart3" name="USART3" register-group-key="usart" address-space-key="data" offset="0x860"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x860"/>
             <signals>
                 <signal pad-id="pb5" function="USART3_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
                 <signal pad-id="pb1" function="USART3" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
@@ -491,7 +491,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart4" name="USART4" module-key="uart_autobd_v4">
-            <register-group-instance key="usart4" name="USART4" register-group-key="usart" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pe1" function="USART4" group="RXD" field="PORTMUX.USARTROUTEB.USART4"/>
                 <signal pad-id="pe0" function="USART4" group="TXD" field="PORTMUX.USARTROUTEB.USART4"/>
@@ -500,34 +500,34 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vporte" name="VPORTE" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vporte" name="VPORTE" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="chip_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xB0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd0" name="ZCD0" register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
             <signals>
                 <signal pad-id="pd1" function="ZCD0" group="IN"/>
                 <signal pad-id="pc7" function="ZCD0_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
@@ -535,7 +535,7 @@
             </signals>
         </peripheral>
         <peripheral key="zcd1" name="ZCD1" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd1" name="ZCD1" register-group-key="zcd" address-space-key="data" offset="0x6C8"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6C8"/>
             <signals>
                 <signal pad-id="pe3" function="ZCD1" group="IN"/>
                 <signal pad-id="pc7" function="ZCD1_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
@@ -543,7 +543,7 @@
             </signals>
         </peripheral>
         <peripheral key="zcd2" name="ZCD2" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd2" name="ZCD2" register-group-key="zcd" address-space-key="data" offset="0x6D0"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6D0"/>
             <signals>
                 <signal pad-id="pc7" function="ZCD2_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD2"/>
                 <signal pad-id="pa7" function="ZCD2" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD2"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB64.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB64.xml
index 14e0300e..a5879114 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB64.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB64.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC0" group="N"/>
@@ -56,7 +56,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
-            <register-group-instance key="ac1" name="AC1" register-group-key="ac" address-space-key="data" offset="0x688"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x688"/>
             <signals>
                 <signal pad-id="pd5" index="0" function="AC1" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC1" group="N"/>
@@ -70,7 +70,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
-            <register-group-instance key="ac2" name="AC2" register-group-key="ac" address-space-key="data" offset="0x690"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x690"/>
             <signals>
                 <signal pad-id="pd7" index="0" function="AC2" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC2" group="N"/>
@@ -84,7 +84,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
@@ -111,10 +111,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
@@ -148,7 +148,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKOUT"/>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
@@ -159,22 +159,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="chip_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -192,22 +192,22 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="chip_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="chip_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="mvio" name="MVIO" module-key="io_multiv_ctrl_avr_v1">
-            <register-group-instance key="mvio" name="MVIO" register-group-key="mvio" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="mvio" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="opamp" name="OPAMP" module-key="amp_opamp_ctrl_avr_v1">
-            <register-group-instance key="opamp" name="OPAMP" register-group-key="opamp" address-space-key="data" offset="0x700"/>
+            <register-group-instance register-group-key="opamp" address-space-key="data" offset="0x700"/>
             <signals>
                 <signal pad-id="pd3" function="OPAMP" group="OP0INN"/>
                 <signal pad-id="pd1" function="OPAMP" group="OP0INP"/>
@@ -221,7 +221,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -234,7 +234,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -247,7 +247,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -260,7 +260,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
@@ -273,7 +273,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pe1" index="1" function="IOPORT" group="PIN"/>
@@ -286,7 +286,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -298,7 +298,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" register-group-key="port" address-space-key="data" offset="0x4C0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4C0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pg1" index="1" function="IOPORT" group="PIN"/>
@@ -311,25 +311,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="chip_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_avr_v2">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pg5" function="SPI0_ALT2" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pe1" function="SPI0_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -346,7 +346,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
-            <register-group-instance key="spi1" name="SPI1" register-group-key="spi" address-space-key="data" offset="0x960"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x960"/>
             <signals>
                 <signal pad-id="pc5" function="SPI1_ALT2" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
                 <signal pad-id="pb5" function="SPI1_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
@@ -363,10 +363,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -413,7 +413,7 @@
             </signals>
         </peripheral>
         <peripheral key="tca1" name="TCA1" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca1" name="TCA1" register-group-key="tca" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
                 <signal pad-id="pe4" index="0" function="TCA1_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
@@ -436,42 +436,42 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
             <signals>
                 <signal pad-id="pb4" index="0" function="TCB2_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcb3" name="TCB3" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb3" name="TCB3" register-group-key="tcb" address-space-key="data" offset="0xB30"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB30"/>
             <signals>
                 <signal pad-id="pc1" index="0" function="TCB3_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
                 <signal pad-id="pb5" index="0" function="TCB3" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
             </signals>
         </peripheral>
         <peripheral key="tcb4" name="TCB4" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb4" name="TCB4" register-group-key="tcb" address-space-key="data" offset="0xB40"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB40"/>
             <signals>
                 <signal pad-id="pc6" index="0" function="TCB4_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB4"/>
                 <signal pad-id="pg3" index="0" function="TCB4" group="WO" field="PORTMUX.TCBROUTEA.TCB4"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pg4" function="TCD0_ALT3" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
@@ -492,7 +492,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pc7" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pc3" function="I2C0_ALT" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -503,7 +503,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi1" name="TWI1" register-group-key="twi" address-space-key="data" offset="0x920"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x920"/>
             <signals>
                 <signal pad-id="pb7" function="I2C1_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
                 <signal pad-id="pb3" function="I2C1_ALT" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
@@ -514,7 +514,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -527,7 +527,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc5" function="USART1_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -540,7 +540,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
-            <register-group-instance key="usart2" name="USART2" register-group-key="usart" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
                 <signal pad-id="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
@@ -551,7 +551,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="uart_autobd_v4">
-            <register-group-instance key="usart3" name="USART3" register-group-key="usart" address-space-key="data" offset="0x860"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x860"/>
             <signals>
                 <signal pad-id="pb5" function="USART3_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
                 <signal pad-id="pb1" function="USART3" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
@@ -564,7 +564,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart4" name="USART4" module-key="uart_autobd_v4">
-            <register-group-instance key="usart4" name="USART4" register-group-key="usart" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pe5" function="USART4_ALT" group="RXD" field="PORTMUX.USARTROUTEB.USART4"/>
                 <signal pad-id="pe1" function="USART4" group="RXD" field="PORTMUX.USARTROUTEB.USART4"/>
@@ -577,7 +577,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart5" name="USART5" module-key="uart_autobd_v4">
-            <register-group-instance key="usart5" name="USART5" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pg5" function="USART5_ALT" group="RXD" field="PORTMUX.USARTROUTEB.USART5"/>
                 <signal pad-id="pg1" function="USART5" group="RXD" field="PORTMUX.USARTROUTEB.USART5"/>
@@ -590,37 +590,37 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vporte" name="VPORTE" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vporte" name="VPORTE" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vportg" name="VPORTG" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportg" name="VPORTG" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="chip_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xB0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd0" name="ZCD0" register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
             <signals>
                 <signal pad-id="pd1" function="ZCD0" group="IN"/>
                 <signal pad-id="pc7" function="ZCD0_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
@@ -628,7 +628,7 @@
             </signals>
         </peripheral>
         <peripheral key="zcd1" name="ZCD1" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd1" name="ZCD1" register-group-key="zcd" address-space-key="data" offset="0x6C8"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6C8"/>
             <signals>
                 <signal pad-id="pe3" function="ZCD1" group="IN"/>
                 <signal pad-id="pc7" function="ZCD1_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
@@ -636,7 +636,7 @@
             </signals>
         </peripheral>
         <peripheral key="zcd2" name="ZCD2" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd2" name="ZCD2" register-group-key="zcd" address-space-key="data" offset="0x6D0"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6D0"/>
             <signals>
                 <signal pad-id="pe7" function="ZCD2" group="IN"/>
                 <signal pad-id="pc7" function="ZCD2_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD2"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD14.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD14.xml
index 3b944f59..5d74fc7c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD14.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD14.xml
@@ -43,7 +43,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd7" index="2" function="AC0" group="N"/>
                 <signal pad-id="pc2" index="3" function="AC0" group="N"/>
@@ -52,7 +52,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
                 <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
@@ -64,10 +64,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
@@ -82,7 +82,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrdd_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
                 <signal pad-id="pa0" function="CLKCTRL" group="XTALHF1"/>
@@ -92,22 +92,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrdd_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
                 <signal pad-id="pd7" index="3" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
@@ -115,29 +115,29 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrdd_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="avrdd_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="avrdd_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="mvio" name="MVIO" module-key="io_multiv_ctrl_avr_v1">
-            <register-group-instance key="mvio" name="MVIO" register-group-key="mvio" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="mvio" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
@@ -145,7 +145,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
@@ -154,32 +154,32 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrdd_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="avrdd_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_avr_v2">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pa1" function="SPI0_ALT3" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pa0" function="SPI0_ALT3" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -198,10 +198,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrdd_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -213,23 +213,23 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pd4" index="2" function="TCD0_ALT4" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pd5" index="3" function="TCD0_ALT4" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_avr_v3">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pc3" function="I2C0" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -242,7 +242,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -256,7 +256,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -266,28 +266,28 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrdd_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="avrdd_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xB0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd3" name="ZCD3" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd3" name="ZCD3" register-group-key="zcd" address-space-key="data" offset="0x6D8"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6D8"/>
             <signals>
                 <signal pad-id="pc2" function="ZCD3" group="IN" field="PORTMUX.ZCDROUTEA.ZCD3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD20.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD20.xml
index 94432460..b44b1965 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD20.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD20.xml
@@ -43,7 +43,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd7" index="2" function="AC0" group="N"/>
                 <signal pad-id="pc2" index="3" function="AC0" group="N"/>
@@ -53,7 +53,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
                 <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
@@ -71,10 +71,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
@@ -93,7 +93,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrdd_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKOUT"/>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
@@ -104,22 +104,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrdd_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -129,22 +129,22 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrdd_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="avrdd_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="avrdd_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="mvio" name="MVIO" module-key="io_multiv_ctrl_avr_v1">
-            <register-group-instance key="mvio" name="MVIO" register-group-key="mvio" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="mvio" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -157,7 +157,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
@@ -165,7 +165,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
@@ -174,32 +174,32 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrdd_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="avrdd_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_avr_v2">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -222,10 +222,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrdd_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -241,22 +241,22 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
@@ -269,7 +269,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_avr_v3">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pc3" function="I2C0" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -286,7 +286,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -308,7 +308,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -318,28 +318,28 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrdd_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="avrdd_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xB0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd3" name="ZCD3" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd3" name="ZCD3" register-group-key="zcd" address-space-key="data" offset="0x6D8"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6D8"/>
             <signals>
                 <signal pad-id="pc2" function="ZCD3" group="IN" field="PORTMUX.ZCDROUTEA.ZCD3"/>
                 <signal pad-id="pa7" function="ZCD3" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD3"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD28.xml
index 29afa22a..52220bab 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD28.xml
@@ -43,7 +43,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd7" index="2" function="AC0" group="N"/>
@@ -55,7 +55,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
                 <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
@@ -79,10 +79,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
@@ -110,7 +110,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrdd_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKOUT"/>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
@@ -123,22 +123,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrdd_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -149,22 +149,22 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrdd_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="avrdd_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="avrdd_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="mvio" name="MVIO" module-key="io_multiv_ctrl_avr_v1">
-            <register-group-instance key="mvio" name="MVIO" register-group-key="mvio" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="mvio" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -177,7 +177,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -186,7 +186,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
@@ -198,7 +198,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -207,25 +207,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrdd_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="avrdd_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_avr_v2">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -250,10 +250,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrdd_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -275,25 +275,25 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
@@ -308,7 +308,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_avr_v3">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pc3" function="I2C0" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -325,7 +325,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -347,7 +347,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -358,28 +358,28 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrdd_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="avrdd_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xB0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd3" name="ZCD3" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd3" name="ZCD3" register-group-key="zcd" address-space-key="data" offset="0x6D8"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6D8"/>
             <signals>
                 <signal pad-id="pc2" function="ZCD3" group="IN" field="PORTMUX.ZCDROUTEA.ZCD3"/>
                 <signal pad-id="pa7" function="ZCD3" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD3"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD32.xml
index d11110df..a7cb64bc 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD32.xml
@@ -43,7 +43,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd7" index="2" function="AC0" group="N"/>
@@ -55,7 +55,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
                 <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
@@ -83,10 +83,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
@@ -116,7 +116,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrdd_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKOUT"/>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
@@ -129,22 +129,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrdd_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -156,22 +156,22 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrdd_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="avrdd_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="avrdd_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="mvio" name="MVIO" module-key="io_multiv_ctrl_avr_v1">
-            <register-group-instance key="mvio" name="MVIO" register-group-key="mvio" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="mvio" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -184,7 +184,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -193,7 +193,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
@@ -205,7 +205,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -218,25 +218,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrdd_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="avrdd_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_avr_v2">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -261,10 +261,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrdd_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -290,27 +290,27 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
                 <signal pad-id="pf4" index="0" function="TCB0_ALT1" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
                 <signal pad-id="pf5" index="0" function="TCB1_ALT1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
@@ -327,7 +327,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_avr_v3">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pc3" function="I2C0" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -344,7 +344,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -366,7 +366,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -377,28 +377,28 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrdd_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="avrdd_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xB0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd3" name="ZCD3" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd3" name="ZCD3" register-group-key="zcd" address-space-key="data" offset="0x6D8"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6D8"/>
             <signals>
                 <signal pad-id="pc2" function="ZCD3" group="IN" field="PORTMUX.ZCDROUTEA.ZCD3"/>
                 <signal pad-id="pa7" function="ZCD3" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD3"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA28.xml
index 3c7fd9fc..a72e91ff 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA28.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC0" group="N"/>
@@ -53,7 +53,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
-            <register-group-instance key="ac1" name="AC1" register-group-key="ac" address-space-key="data" offset="0x688"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x688"/>
             <signals>
                 <signal pad-id="pd5" index="0" function="AC1" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC1" group="N"/>
@@ -66,7 +66,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
-            <register-group-instance key="ac2" name="AC2" register-group-key="ac" address-space-key="data" offset="0x690"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x690"/>
             <signals>
                 <signal pad-id="pd7" index="0" function="AC2" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC2" group="N"/>
@@ -78,7 +78,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
@@ -93,10 +93,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
@@ -117,7 +117,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrda_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKOUT"/>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
@@ -126,22 +126,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrda_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -151,19 +151,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrda_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="avrda_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="avrda_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -176,7 +176,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -185,7 +185,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
@@ -198,7 +198,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -206,7 +206,7 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrda_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="adc_ptc_ctrl_v1">
             <signals>
@@ -231,22 +231,22 @@
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="avrda_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_v1">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -255,7 +255,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
-            <register-group-instance key="spi1" name="SPI1" register-group-key="spi" address-space-key="data" offset="0x960"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x960"/>
             <signals>
                 <signal pad-id="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
                 <signal pad-id="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
@@ -264,10 +264,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrda_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pd0" index="0" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -290,25 +290,25 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
@@ -319,7 +319,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -332,7 +332,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -345,7 +345,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -354,35 +354,35 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
-            <register-group-instance key="usart2" name="USART2" register-group-key="usart" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
                 <signal pad-id="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrda_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="avrda_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd0" name="ZCD0" register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
             <signals>
                 <signal pad-id="pd1" function="ZCD0" group="IN"/>
                 <signal pad-id="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA32.xml
index 1d14df8f..221b318b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA32.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC0" group="N"/>
@@ -53,7 +53,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
-            <register-group-instance key="ac1" name="AC1" register-group-key="ac" address-space-key="data" offset="0x688"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x688"/>
             <signals>
                 <signal pad-id="pd5" index="0" function="AC1" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC1" group="N"/>
@@ -66,7 +66,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
-            <register-group-instance key="ac2" name="AC2" register-group-key="ac" address-space-key="data" offset="0x690"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x690"/>
             <signals>
                 <signal pad-id="pd7" index="0" function="AC2" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC2" group="N"/>
@@ -78,7 +78,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
@@ -97,10 +97,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
@@ -123,7 +123,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrda_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKOUT"/>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
@@ -132,22 +132,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrda_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -158,19 +158,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrda_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="avrda_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="avrda_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -183,7 +183,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -192,7 +192,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
@@ -205,7 +205,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -217,7 +217,7 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrda_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="adc_ptc_ctrl_v1">
             <signals>
@@ -246,22 +246,22 @@
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="avrda_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_v1">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -270,7 +270,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
-            <register-group-instance key="spi1" name="SPI1" register-group-key="spi" address-space-key="data" offset="0x960"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x960"/>
             <signals>
                 <signal pad-id="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
                 <signal pad-id="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
@@ -279,10 +279,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrda_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pd0" index="0" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -309,27 +309,27 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
@@ -342,7 +342,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -355,7 +355,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi1" name="TWI1" register-group-key="twi" address-space-key="data" offset="0x920"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x920"/>
             <signals>
                 <signal pad-id="pf3" function="I2C1_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
                 <signal pad-id="pf3" function="I2C1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
@@ -364,7 +364,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -377,7 +377,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -386,7 +386,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
-            <register-group-instance key="usart2" name="USART2" register-group-key="usart" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
                 <signal pad-id="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
@@ -397,28 +397,28 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrda_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="avrda_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd0" name="ZCD0" register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
             <signals>
                 <signal pad-id="pd1" function="ZCD0" group="IN"/>
                 <signal pad-id="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA48.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA48.xml
index ab76e610..53498d6b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA48.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC0" group="N"/>
@@ -56,7 +56,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
-            <register-group-instance key="ac1" name="AC1" register-group-key="ac" address-space-key="data" offset="0x688"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x688"/>
             <signals>
                 <signal pad-id="pd5" index="0" function="AC1" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC1" group="N"/>
@@ -70,7 +70,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
-            <register-group-instance key="ac2" name="AC2" register-group-key="ac" address-space-key="data" offset="0x690"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x690"/>
             <signals>
                 <signal pad-id="pd7" index="0" function="AC2" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC2" group="N"/>
@@ -84,7 +84,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
@@ -107,10 +107,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
@@ -138,7 +138,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrda_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKOUT"/>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
@@ -147,22 +147,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrda_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -176,19 +176,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrda_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="avrda_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="avrda_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -201,7 +201,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -212,7 +212,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -225,7 +225,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
@@ -238,7 +238,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pe1" index="1" function="IOPORT" group="PIN"/>
@@ -247,7 +247,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -259,7 +259,7 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrda_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="adc_ptc_ctrl_v1">
             <signals>
@@ -298,22 +298,22 @@
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="avrda_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_v1">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pe1" function="SPI0_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -326,7 +326,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
-            <register-group-instance key="spi1" name="SPI1" register-group-key="spi" address-space-key="data" offset="0x960"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x960"/>
             <signals>
                 <signal pad-id="pb5" function="SPI1_ALT2" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
                 <signal pad-id="pc5" function="SPI1_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
@@ -341,10 +341,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrda_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pe0" index="0" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -383,7 +383,7 @@
             </signals>
         </peripheral>
         <peripheral key="tca1" name="TCA1" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca1" name="TCA1" register-group-key="tca" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pc4" index="0" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
                 <signal pad-id="pb0" index="0" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
@@ -397,35 +397,35 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
             <signals>
                 <signal pad-id="pb4" index="0" function="TCB2_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcb3" name="TCB3" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb3" name="TCB3" register-group-key="tcb" address-space-key="data" offset="0xB30"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB30"/>
             <signals>
                 <signal pad-id="pc1" index="0" function="TCB3_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
                 <signal pad-id="pb5" index="0" function="TCB3" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pb4" function="TCD0_ALT" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
@@ -440,7 +440,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -457,7 +457,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi1" name="TWI1" register-group-key="twi" address-space-key="data" offset="0x920"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x920"/>
             <signals>
                 <signal pad-id="pb3" function="I2C1_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
                 <signal pad-id="pf3" function="I2C1_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
@@ -470,7 +470,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -483,7 +483,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc5" function="USART1_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -496,7 +496,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
-            <register-group-instance key="usart2" name="USART2" register-group-key="usart" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
                 <signal pad-id="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
@@ -507,7 +507,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="uart_autobd_v4">
-            <register-group-instance key="usart3" name="USART3" register-group-key="usart" address-space-key="data" offset="0x860"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x860"/>
             <signals>
                 <signal pad-id="pb5" function="USART3_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
                 <signal pad-id="pb1" function="USART3" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
@@ -518,7 +518,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart4" name="USART4" module-key="uart_autobd_v4">
-            <register-group-instance key="usart4" name="USART4" register-group-key="usart" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pe1" function="USART4" group="RXD" field="PORTMUX.USARTROUTEB.USART4"/>
                 <signal pad-id="pe0" function="USART4" group="TXD" field="PORTMUX.USARTROUTEB.USART4"/>
@@ -527,34 +527,34 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrda_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vporte" name="VPORTE" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vporte" name="VPORTE" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="avrda_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd0" name="ZCD0" register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
             <signals>
                 <signal pad-id="pd1" function="ZCD0" group="IN"/>
                 <signal pad-id="pc7" function="ZCD0_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
@@ -562,7 +562,7 @@
             </signals>
         </peripheral>
         <peripheral key="zcd1" name="ZCD1" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd1" name="ZCD1" register-group-key="zcd" address-space-key="data" offset="0x6C8"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6C8"/>
             <signals>
                 <signal pad-id="pe3" function="ZCD1" group="IN"/>
                 <signal pad-id="pc7" function="ZCD1_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB28.xml
index ede3461c..d24bb355 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB28.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd7" index="2" function="AC0" group="N"/>
@@ -52,7 +52,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
-            <register-group-instance key="ac1" name="AC1" register-group-key="ac" address-space-key="data" offset="0x688"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x688"/>
             <signals>
                 <signal pad-id="pd5" index="0" function="AC1" group="N"/>
                 <signal pad-id="pd7" index="2" function="AC1" group="N"/>
@@ -64,7 +64,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
-            <register-group-instance key="ac2" name="AC2" register-group-key="ac" address-space-key="data" offset="0x690"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x690"/>
             <signals>
                 <signal pad-id="pd7" index="0" function="AC2" group="N"/>
                 <signal pad-id="pd7" index="2" function="AC2" group="N"/>
@@ -75,7 +75,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
                 <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
@@ -89,10 +89,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
@@ -112,7 +112,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKOUT"/>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
@@ -123,22 +123,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="chip_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -148,22 +148,22 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="chip_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="chip_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="mvio" name="MVIO" module-key="io_multiv_ctrl_avr_v1">
-            <register-group-instance key="mvio" name="MVIO" register-group-key="mvio" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="mvio" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="opamp" name="OPAMP" module-key="amp_opamp_ctrl_avr_v1">
-            <register-group-instance key="opamp" name="OPAMP" register-group-key="opamp" address-space-key="data" offset="0x700"/>
+            <register-group-instance register-group-key="opamp" address-space-key="data" offset="0x700"/>
             <signals>
                 <signal pad-id="pd3" function="OPAMP" group="OP0INN"/>
                 <signal pad-id="pd1" function="OPAMP" group="OP0INP"/>
@@ -174,7 +174,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -187,7 +187,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -196,7 +196,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
@@ -208,7 +208,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -216,25 +216,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="chip_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_avr_v2">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -243,7 +243,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
-            <register-group-instance key="spi1" name="SPI1" register-group-key="spi" address-space-key="data" offset="0x960"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x960"/>
             <signals>
                 <signal pad-id="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
                 <signal pad-id="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
@@ -252,10 +252,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -277,25 +277,25 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
@@ -306,7 +306,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pc3" function="I2C0_ALT" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -315,7 +315,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -328,7 +328,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -337,35 +337,35 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
-            <register-group-instance key="usart2" name="USART2" register-group-key="usart" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
                 <signal pad-id="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="chip_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xB0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd0" name="ZCD0" register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
             <signals>
                 <signal pad-id="pd1" function="ZCD0" group="IN"/>
                 <signal pad-id="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB32.xml
index 5a74f1f9..07ea77f5 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB32.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd7" index="2" function="AC0" group="N"/>
@@ -52,7 +52,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
-            <register-group-instance key="ac1" name="AC1" register-group-key="ac" address-space-key="data" offset="0x688"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x688"/>
             <signals>
                 <signal pad-id="pd5" index="0" function="AC1" group="N"/>
                 <signal pad-id="pd7" index="2" function="AC1" group="N"/>
@@ -64,7 +64,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
-            <register-group-instance key="ac2" name="AC2" register-group-key="ac" address-space-key="data" offset="0x690"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x690"/>
             <signals>
                 <signal pad-id="pd7" index="0" function="AC2" group="N"/>
                 <signal pad-id="pd7" index="2" function="AC2" group="N"/>
@@ -75,7 +75,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
                 <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
@@ -93,10 +93,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
@@ -118,7 +118,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKOUT"/>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
@@ -129,22 +129,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="chip_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -155,22 +155,22 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="chip_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="chip_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="mvio" name="MVIO" module-key="io_multiv_ctrl_avr_v1">
-            <register-group-instance key="mvio" name="MVIO" register-group-key="mvio" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="mvio" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="opamp" name="OPAMP" module-key="amp_opamp_ctrl_avr_v1">
-            <register-group-instance key="opamp" name="OPAMP" register-group-key="opamp" address-space-key="data" offset="0x700"/>
+            <register-group-instance register-group-key="opamp" address-space-key="data" offset="0x700"/>
             <signals>
                 <signal pad-id="pd3" function="OPAMP" group="OP0INN"/>
                 <signal pad-id="pd1" function="OPAMP" group="OP0INP"/>
@@ -181,7 +181,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -194,7 +194,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -203,7 +203,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
@@ -215,7 +215,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -227,25 +227,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="chip_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_avr_v2">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -254,7 +254,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
-            <register-group-instance key="spi1" name="SPI1" register-group-key="spi" address-space-key="data" offset="0x960"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x960"/>
             <signals>
                 <signal pad-id="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
                 <signal pad-id="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
@@ -263,10 +263,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -292,27 +292,27 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
@@ -325,7 +325,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pc3" function="I2C0_ALT" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -334,14 +334,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi1" name="TWI1" register-group-key="twi" address-space-key="data" offset="0x920"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x920"/>
             <signals>
                 <signal pad-id="pf3" function="I2C1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
                 <signal pad-id="pf2" function="I2C1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -354,7 +354,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -363,7 +363,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
-            <register-group-instance key="usart2" name="USART2" register-group-key="usart" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
                 <signal pad-id="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
@@ -374,28 +374,28 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="chip_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xB0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd0" name="ZCD0" register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
             <signals>
                 <signal pad-id="pd1" function="ZCD0" group="IN"/>
                 <signal pad-id="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB48.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB48.xml
index e266e7bf..8eea99e7 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB48.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC0" group="N"/>
@@ -56,7 +56,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
-            <register-group-instance key="ac1" name="AC1" register-group-key="ac" address-space-key="data" offset="0x688"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x688"/>
             <signals>
                 <signal pad-id="pd5" index="0" function="AC1" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC1" group="N"/>
@@ -70,7 +70,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
-            <register-group-instance key="ac2" name="AC2" register-group-key="ac" address-space-key="data" offset="0x690"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x690"/>
             <signals>
                 <signal pad-id="pd7" index="0" function="AC2" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC2" group="N"/>
@@ -84,7 +84,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
@@ -107,10 +107,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
@@ -138,7 +138,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKOUT"/>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
@@ -149,22 +149,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="chip_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -178,22 +178,22 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="chip_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="chip_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="mvio" name="MVIO" module-key="io_multiv_ctrl_avr_v1">
-            <register-group-instance key="mvio" name="MVIO" register-group-key="mvio" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="mvio" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="opamp" name="OPAMP" module-key="amp_opamp_ctrl_avr_v1">
-            <register-group-instance key="opamp" name="OPAMP" register-group-key="opamp" address-space-key="data" offset="0x700"/>
+            <register-group-instance register-group-key="opamp" address-space-key="data" offset="0x700"/>
             <signals>
                 <signal pad-id="pd3" function="OPAMP" group="OP0INN"/>
                 <signal pad-id="pd1" function="OPAMP" group="OP0INP"/>
@@ -207,7 +207,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -220,7 +220,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -231,7 +231,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -244,7 +244,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
@@ -257,7 +257,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pe1" index="1" function="IOPORT" group="PIN"/>
@@ -266,7 +266,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -278,25 +278,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="chip_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_avr_v2">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pe1" function="SPI0_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -309,7 +309,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
-            <register-group-instance key="spi1" name="SPI1" register-group-key="spi" address-space-key="data" offset="0x960"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x960"/>
             <signals>
                 <signal pad-id="pc5" function="SPI1_ALT2" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
                 <signal pad-id="pb5" function="SPI1_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
@@ -324,10 +324,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pe0" index="0" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -366,7 +366,7 @@
             </signals>
         </peripheral>
         <peripheral key="tca1" name="TCA1" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca1" name="TCA1" register-group-key="tca" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pc4" index="0" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
                 <signal pad-id="pb0" index="0" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
@@ -380,35 +380,35 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
             <signals>
                 <signal pad-id="pb4" index="0" function="TCB2_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcb3" name="TCB3" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb3" name="TCB3" register-group-key="tcb" address-space-key="data" offset="0xB30"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB30"/>
             <signals>
                 <signal pad-id="pc1" index="0" function="TCB3_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
                 <signal pad-id="pb5" index="0" function="TCB3" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pb4" function="TCD0_ALT" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
@@ -423,7 +423,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pc7" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pc3" function="I2C0_ALT" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -434,7 +434,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi1" name="TWI1" register-group-key="twi" address-space-key="data" offset="0x920"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x920"/>
             <signals>
                 <signal pad-id="pb3" function="I2C1_ALT" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
                 <signal pad-id="pf3" function="I2C1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
@@ -443,7 +443,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -456,7 +456,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc5" function="USART1_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -469,7 +469,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
-            <register-group-instance key="usart2" name="USART2" register-group-key="usart" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
                 <signal pad-id="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
@@ -480,7 +480,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="uart_autobd_v4">
-            <register-group-instance key="usart3" name="USART3" register-group-key="usart" address-space-key="data" offset="0x860"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x860"/>
             <signals>
                 <signal pad-id="pb5" function="USART3_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
                 <signal pad-id="pb1" function="USART3" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
@@ -491,7 +491,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart4" name="USART4" module-key="uart_autobd_v4">
-            <register-group-instance key="usart4" name="USART4" register-group-key="usart" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pe1" function="USART4" group="RXD" field="PORTMUX.USARTROUTEB.USART4"/>
                 <signal pad-id="pe0" function="USART4" group="TXD" field="PORTMUX.USARTROUTEB.USART4"/>
@@ -500,34 +500,34 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vporte" name="VPORTE" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vporte" name="VPORTE" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="chip_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xB0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd0" name="ZCD0" register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
             <signals>
                 <signal pad-id="pd1" function="ZCD0" group="IN"/>
                 <signal pad-id="pc7" function="ZCD0_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
@@ -535,7 +535,7 @@
             </signals>
         </peripheral>
         <peripheral key="zcd1" name="ZCD1" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd1" name="ZCD1" register-group-key="zcd" address-space-key="data" offset="0x6C8"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6C8"/>
             <signals>
                 <signal pad-id="pe3" function="ZCD1" group="IN"/>
                 <signal pad-id="pc7" function="ZCD1_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
@@ -543,7 +543,7 @@
             </signals>
         </peripheral>
         <peripheral key="zcd2" name="ZCD2" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd2" name="ZCD2" register-group-key="zcd" address-space-key="data" offset="0x6D0"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6D0"/>
             <signals>
                 <signal pad-id="pc7" function="ZCD2_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD2"/>
                 <signal pad-id="pa7" function="ZCD2" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD2"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD14.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD14.xml
index c064f5cd..5a3dd6ed 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD14.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD14.xml
@@ -43,7 +43,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd7" index="2" function="AC0" group="N"/>
                 <signal pad-id="pc2" index="3" function="AC0" group="N"/>
@@ -52,7 +52,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
                 <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
@@ -64,10 +64,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
@@ -82,7 +82,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrdd_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
                 <signal pad-id="pa0" function="CLKCTRL" group="XTALHF1"/>
@@ -92,22 +92,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrdd_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
                 <signal pad-id="pd7" index="3" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
@@ -115,29 +115,29 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrdd_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="avrdd_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="avrdd_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="mvio" name="MVIO" module-key="io_multiv_ctrl_avr_v1">
-            <register-group-instance key="mvio" name="MVIO" register-group-key="mvio" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="mvio" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
@@ -145,7 +145,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
@@ -154,32 +154,32 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrdd_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="avrdd_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_avr_v2">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pa1" function="SPI0_ALT3" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pa0" function="SPI0_ALT3" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -198,10 +198,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrdd_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -213,23 +213,23 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pd4" index="2" function="TCD0_ALT4" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pd5" index="3" function="TCD0_ALT4" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_avr_v3">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pc3" function="I2C0" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -242,7 +242,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -256,7 +256,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -266,28 +266,28 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrdd_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="avrdd_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xB0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd3" name="ZCD3" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd3" name="ZCD3" register-group-key="zcd" address-space-key="data" offset="0x6D8"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6D8"/>
             <signals>
                 <signal pad-id="pc2" function="ZCD3" group="IN" field="PORTMUX.ZCDROUTEA.ZCD3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD20.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD20.xml
index 309699e1..34a57364 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD20.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD20.xml
@@ -43,7 +43,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd7" index="2" function="AC0" group="N"/>
                 <signal pad-id="pc2" index="3" function="AC0" group="N"/>
@@ -53,7 +53,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
                 <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
@@ -71,10 +71,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
@@ -93,7 +93,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrdd_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKOUT"/>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
@@ -104,22 +104,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrdd_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -129,22 +129,22 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrdd_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="avrdd_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="avrdd_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="mvio" name="MVIO" module-key="io_multiv_ctrl_avr_v1">
-            <register-group-instance key="mvio" name="MVIO" register-group-key="mvio" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="mvio" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -157,7 +157,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
@@ -165,7 +165,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
@@ -174,32 +174,32 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrdd_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="avrdd_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_avr_v2">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -222,10 +222,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrdd_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -241,22 +241,22 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
@@ -269,7 +269,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_avr_v3">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pc3" function="I2C0" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -286,7 +286,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -308,7 +308,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -318,28 +318,28 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrdd_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="avrdd_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xB0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd3" name="ZCD3" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd3" name="ZCD3" register-group-key="zcd" address-space-key="data" offset="0x6D8"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6D8"/>
             <signals>
                 <signal pad-id="pc2" function="ZCD3" group="IN" field="PORTMUX.ZCDROUTEA.ZCD3"/>
                 <signal pad-id="pa7" function="ZCD3" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD3"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD28.xml
index b67fe880..db669db7 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD28.xml
@@ -43,7 +43,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd7" index="2" function="AC0" group="N"/>
@@ -55,7 +55,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
                 <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
@@ -79,10 +79,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
@@ -110,7 +110,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrdd_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKOUT"/>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
@@ -123,22 +123,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrdd_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -149,22 +149,22 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrdd_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="avrdd_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="avrdd_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="mvio" name="MVIO" module-key="io_multiv_ctrl_avr_v1">
-            <register-group-instance key="mvio" name="MVIO" register-group-key="mvio" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="mvio" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -177,7 +177,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -186,7 +186,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
@@ -198,7 +198,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -207,25 +207,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrdd_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="avrdd_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_avr_v2">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -250,10 +250,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrdd_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -275,25 +275,25 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
@@ -308,7 +308,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_avr_v3">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pc3" function="I2C0" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -325,7 +325,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -347,7 +347,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -358,28 +358,28 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrdd_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="avrdd_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xB0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd3" name="ZCD3" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd3" name="ZCD3" register-group-key="zcd" address-space-key="data" offset="0x6D8"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6D8"/>
             <signals>
                 <signal pad-id="pc2" function="ZCD3" group="IN" field="PORTMUX.ZCDROUTEA.ZCD3"/>
                 <signal pad-id="pa7" function="ZCD3" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD3"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD32.xml
index 1fc4e3f5..0863b44e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD32.xml
@@ -43,7 +43,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd7" index="2" function="AC0" group="N"/>
@@ -55,7 +55,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
                 <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
@@ -83,10 +83,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
@@ -116,7 +116,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrdd_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKOUT"/>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
@@ -129,22 +129,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrdd_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -156,22 +156,22 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrdd_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="avrdd_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="avrdd_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="mvio" name="MVIO" module-key="io_multiv_ctrl_avr_v1">
-            <register-group-instance key="mvio" name="MVIO" register-group-key="mvio" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="mvio" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -184,7 +184,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -193,7 +193,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
@@ -205,7 +205,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -218,25 +218,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrdd_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="avrdd_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_avr_v2">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -261,10 +261,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrdd_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -290,27 +290,27 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
                 <signal pad-id="pf4" index="0" function="TCB0_ALT1" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
                 <signal pad-id="pf5" index="0" function="TCB1_ALT1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
@@ -327,7 +327,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_avr_v3">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pc3" function="I2C0" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -344,7 +344,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -366,7 +366,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -377,28 +377,28 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrdd_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="avrdd_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xB0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd3" name="ZCD3" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd3" name="ZCD3" register-group-key="zcd" address-space-key="data" offset="0x6D8"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6D8"/>
             <signals>
                 <signal pad-id="pc2" function="ZCD3" group="IN" field="PORTMUX.ZCDROUTEA.ZCD3"/>
                 <signal pad-id="pa7" function="ZCD3" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD3"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA28.xml
index 13d7f3a9..7f91b64c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA28.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC0" group="N"/>
@@ -53,7 +53,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
-            <register-group-instance key="ac1" name="AC1" register-group-key="ac" address-space-key="data" offset="0x688"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x688"/>
             <signals>
                 <signal pad-id="pd5" index="0" function="AC1" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC1" group="N"/>
@@ -66,7 +66,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
-            <register-group-instance key="ac2" name="AC2" register-group-key="ac" address-space-key="data" offset="0x690"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x690"/>
             <signals>
                 <signal pad-id="pd7" index="0" function="AC2" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC2" group="N"/>
@@ -78,7 +78,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
@@ -93,10 +93,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
@@ -117,7 +117,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrda_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKOUT"/>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
@@ -126,22 +126,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrda_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -151,19 +151,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrda_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="avrda_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="avrda_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -176,7 +176,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -185,7 +185,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
@@ -198,7 +198,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -206,7 +206,7 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrda_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="adc_ptc_ctrl_v1">
             <signals>
@@ -231,22 +231,22 @@
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="avrda_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_v1">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -255,7 +255,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
-            <register-group-instance key="spi1" name="SPI1" register-group-key="spi" address-space-key="data" offset="0x960"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x960"/>
             <signals>
                 <signal pad-id="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
                 <signal pad-id="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
@@ -264,10 +264,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrda_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pd0" index="0" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -290,25 +290,25 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
@@ -319,7 +319,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -332,7 +332,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -345,7 +345,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -354,35 +354,35 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
-            <register-group-instance key="usart2" name="USART2" register-group-key="usart" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
                 <signal pad-id="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrda_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="avrda_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd0" name="ZCD0" register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
             <signals>
                 <signal pad-id="pd1" function="ZCD0" group="IN"/>
                 <signal pad-id="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA32.xml
index 4de6a87c..c86b2e60 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA32.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC0" group="N"/>
@@ -53,7 +53,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
-            <register-group-instance key="ac1" name="AC1" register-group-key="ac" address-space-key="data" offset="0x688"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x688"/>
             <signals>
                 <signal pad-id="pd5" index="0" function="AC1" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC1" group="N"/>
@@ -66,7 +66,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
-            <register-group-instance key="ac2" name="AC2" register-group-key="ac" address-space-key="data" offset="0x690"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x690"/>
             <signals>
                 <signal pad-id="pd7" index="0" function="AC2" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC2" group="N"/>
@@ -78,7 +78,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
@@ -97,10 +97,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
@@ -123,7 +123,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrda_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKOUT"/>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
@@ -132,22 +132,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrda_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -158,19 +158,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrda_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="avrda_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="avrda_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -183,7 +183,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -192,7 +192,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
@@ -205,7 +205,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -217,7 +217,7 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrda_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="adc_ptc_ctrl_v1">
             <signals>
@@ -246,22 +246,22 @@
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="avrda_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_v1">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -270,7 +270,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
-            <register-group-instance key="spi1" name="SPI1" register-group-key="spi" address-space-key="data" offset="0x960"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x960"/>
             <signals>
                 <signal pad-id="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
                 <signal pad-id="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
@@ -279,10 +279,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrda_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pd0" index="0" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -309,27 +309,27 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
@@ -342,7 +342,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -355,7 +355,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi1" name="TWI1" register-group-key="twi" address-space-key="data" offset="0x920"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x920"/>
             <signals>
                 <signal pad-id="pf3" function="I2C1_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
                 <signal pad-id="pf3" function="I2C1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
@@ -364,7 +364,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -377,7 +377,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -386,7 +386,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
-            <register-group-instance key="usart2" name="USART2" register-group-key="usart" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
                 <signal pad-id="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
@@ -397,28 +397,28 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrda_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="avrda_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd0" name="ZCD0" register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
             <signals>
                 <signal pad-id="pd1" function="ZCD0" group="IN"/>
                 <signal pad-id="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA48.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA48.xml
index 55a5b3d9..dd542158 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA48.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC0" group="N"/>
@@ -56,7 +56,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
-            <register-group-instance key="ac1" name="AC1" register-group-key="ac" address-space-key="data" offset="0x688"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x688"/>
             <signals>
                 <signal pad-id="pd5" index="0" function="AC1" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC1" group="N"/>
@@ -70,7 +70,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
-            <register-group-instance key="ac2" name="AC2" register-group-key="ac" address-space-key="data" offset="0x690"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x690"/>
             <signals>
                 <signal pad-id="pd7" index="0" function="AC2" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC2" group="N"/>
@@ -84,7 +84,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
@@ -107,10 +107,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
@@ -138,7 +138,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrda_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKOUT"/>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
@@ -147,22 +147,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrda_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -176,19 +176,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrda_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="avrda_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="avrda_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -201,7 +201,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -212,7 +212,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -225,7 +225,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
@@ -238,7 +238,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pe1" index="1" function="IOPORT" group="PIN"/>
@@ -247,7 +247,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -259,7 +259,7 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrda_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="adc_ptc_ctrl_v1">
             <signals>
@@ -298,22 +298,22 @@
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="avrda_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_v1">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pe1" function="SPI0_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -326,7 +326,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
-            <register-group-instance key="spi1" name="SPI1" register-group-key="spi" address-space-key="data" offset="0x960"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x960"/>
             <signals>
                 <signal pad-id="pb5" function="SPI1_ALT2" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
                 <signal pad-id="pc5" function="SPI1_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
@@ -341,10 +341,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrda_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pe0" index="0" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -383,7 +383,7 @@
             </signals>
         </peripheral>
         <peripheral key="tca1" name="TCA1" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca1" name="TCA1" register-group-key="tca" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pc4" index="0" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
                 <signal pad-id="pb0" index="0" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
@@ -397,35 +397,35 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
             <signals>
                 <signal pad-id="pb4" index="0" function="TCB2_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcb3" name="TCB3" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb3" name="TCB3" register-group-key="tcb" address-space-key="data" offset="0xB30"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB30"/>
             <signals>
                 <signal pad-id="pc1" index="0" function="TCB3_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
                 <signal pad-id="pb5" index="0" function="TCB3" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pb4" function="TCD0_ALT" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
@@ -440,7 +440,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -457,7 +457,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi1" name="TWI1" register-group-key="twi" address-space-key="data" offset="0x920"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x920"/>
             <signals>
                 <signal pad-id="pb3" function="I2C1_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
                 <signal pad-id="pf3" function="I2C1_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
@@ -470,7 +470,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -483,7 +483,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc5" function="USART1_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -496,7 +496,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
-            <register-group-instance key="usart2" name="USART2" register-group-key="usart" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
                 <signal pad-id="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
@@ -507,7 +507,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="uart_autobd_v4">
-            <register-group-instance key="usart3" name="USART3" register-group-key="usart" address-space-key="data" offset="0x860"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x860"/>
             <signals>
                 <signal pad-id="pb5" function="USART3_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
                 <signal pad-id="pb1" function="USART3" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
@@ -518,7 +518,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart4" name="USART4" module-key="uart_autobd_v4">
-            <register-group-instance key="usart4" name="USART4" register-group-key="usart" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pe1" function="USART4" group="RXD" field="PORTMUX.USARTROUTEB.USART4"/>
                 <signal pad-id="pe0" function="USART4" group="TXD" field="PORTMUX.USARTROUTEB.USART4"/>
@@ -527,34 +527,34 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrda_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vporte" name="VPORTE" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vporte" name="VPORTE" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="avrda_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd0" name="ZCD0" register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
             <signals>
                 <signal pad-id="pd1" function="ZCD0" group="IN"/>
                 <signal pad-id="pc7" function="ZCD0_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
@@ -562,7 +562,7 @@
             </signals>
         </peripheral>
         <peripheral key="zcd1" name="ZCD1" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd1" name="ZCD1" register-group-key="zcd" address-space-key="data" offset="0x6C8"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6C8"/>
             <signals>
                 <signal pad-id="pe3" function="ZCD1" group="IN"/>
                 <signal pad-id="pc7" function="ZCD1_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA64.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA64.xml
index 51b2932e..ff5e169a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA64.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA64.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC0" group="N"/>
@@ -56,7 +56,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
-            <register-group-instance key="ac1" name="AC1" register-group-key="ac" address-space-key="data" offset="0x688"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x688"/>
             <signals>
                 <signal pad-id="pd5" index="0" function="AC1" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC1" group="N"/>
@@ -70,7 +70,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
-            <register-group-instance key="ac2" name="AC2" register-group-key="ac" address-space-key="data" offset="0x690"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x690"/>
             <signals>
                 <signal pad-id="pd7" index="0" function="AC2" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC2" group="N"/>
@@ -84,7 +84,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
@@ -111,10 +111,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
@@ -148,7 +148,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrda_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKOUT"/>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
@@ -157,22 +157,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrda_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -190,19 +190,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrda_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="avrda_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="avrda_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -215,7 +215,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -228,7 +228,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -241,7 +241,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
@@ -254,7 +254,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pe1" index="1" function="IOPORT" group="PIN"/>
@@ -267,7 +267,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -279,7 +279,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" register-group-key="port" address-space-key="data" offset="0x4C0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4C0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pg1" index="1" function="IOPORT" group="PIN"/>
@@ -292,7 +292,7 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrda_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="adc_ptc_ctrl_v1">
             <signals>
@@ -345,22 +345,22 @@
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="avrda_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_v1">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pg5" function="SPI0_ALT2" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pe1" function="SPI0_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -377,7 +377,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
-            <register-group-instance key="spi1" name="SPI1" register-group-key="spi" address-space-key="data" offset="0x960"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x960"/>
             <signals>
                 <signal pad-id="pb5" function="SPI1_ALT2" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
                 <signal pad-id="pc5" function="SPI1_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
@@ -394,10 +394,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrda_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -444,7 +444,7 @@
             </signals>
         </peripheral>
         <peripheral key="tca1" name="TCA1" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca1" name="TCA1" register-group-key="tca" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
                 <signal pad-id="pe4" index="0" function="TCA1_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
@@ -467,42 +467,42 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
             <signals>
                 <signal pad-id="pb4" index="0" function="TCB2_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcb3" name="TCB3" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb3" name="TCB3" register-group-key="tcb" address-space-key="data" offset="0xB30"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB30"/>
             <signals>
                 <signal pad-id="pc1" index="0" function="TCB3_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
                 <signal pad-id="pb5" index="0" function="TCB3" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
             </signals>
         </peripheral>
         <peripheral key="tcb4" name="TCB4" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb4" name="TCB4" register-group-key="tcb" address-space-key="data" offset="0xB40"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB40"/>
             <signals>
                 <signal pad-id="pc6" index="0" function="TCB4_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB4"/>
                 <signal pad-id="pg3" index="0" function="TCB4" group="WO" field="PORTMUX.TCBROUTEA.TCB4"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pg4" function="TCD0_ALT3" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
@@ -523,7 +523,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -540,7 +540,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi1" name="TWI1" register-group-key="twi" address-space-key="data" offset="0x920"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x920"/>
             <signals>
                 <signal pad-id="pb3" function="I2C1_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
                 <signal pad-id="pf3" function="I2C1_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
@@ -557,7 +557,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -570,7 +570,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc5" function="USART1_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -583,7 +583,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
-            <register-group-instance key="usart2" name="USART2" register-group-key="usart" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
                 <signal pad-id="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
@@ -594,7 +594,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="uart_autobd_v4">
-            <register-group-instance key="usart3" name="USART3" register-group-key="usart" address-space-key="data" offset="0x860"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x860"/>
             <signals>
                 <signal pad-id="pb5" function="USART3_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
                 <signal pad-id="pb1" function="USART3" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
@@ -607,7 +607,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart4" name="USART4" module-key="uart_autobd_v4">
-            <register-group-instance key="usart4" name="USART4" register-group-key="usart" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pe5" function="USART4_ALT" group="RXD" field="PORTMUX.USARTROUTEB.USART4"/>
                 <signal pad-id="pe1" function="USART4" group="RXD" field="PORTMUX.USARTROUTEB.USART4"/>
@@ -620,7 +620,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart5" name="USART5" module-key="uart_autobd_v4">
-            <register-group-instance key="usart5" name="USART5" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pg5" function="USART5_ALT" group="RXD" field="PORTMUX.USARTROUTEB.USART5"/>
                 <signal pad-id="pg1" function="USART5" group="RXD" field="PORTMUX.USARTROUTEB.USART5"/>
@@ -633,37 +633,37 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrda_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vporte" name="VPORTE" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vporte" name="VPORTE" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vportg" name="VPORTG" module-key="gpio_ports_v6_vport">
-            <register-group-instance key="vportg" name="VPORTG" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="avrda_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd0" name="ZCD0" register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
             <signals>
                 <signal pad-id="pd1" function="ZCD0" group="IN"/>
                 <signal pad-id="pc7" function="ZCD0_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
@@ -671,7 +671,7 @@
             </signals>
         </peripheral>
         <peripheral key="zcd1" name="ZCD1" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd1" name="ZCD1" register-group-key="zcd" address-space-key="data" offset="0x6C8"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6C8"/>
             <signals>
                 <signal pad-id="pe3" function="ZCD1" group="IN"/>
                 <signal pad-id="pc7" function="ZCD1_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
@@ -679,7 +679,7 @@
             </signals>
         </peripheral>
         <peripheral key="zcd2" name="ZCD2" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd2" name="ZCD2" register-group-key="zcd" address-space-key="data" offset="0x6D0"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6D0"/>
             <signals>
                 <signal pad-id="pe7" function="ZCD2" group="IN"/>
                 <signal pad-id="pc7" function="ZCD2_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD2"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB28.xml
index 8b2f244b..8e4cb0f5 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB28.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd7" index="2" function="AC0" group="N"/>
@@ -52,7 +52,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
-            <register-group-instance key="ac1" name="AC1" register-group-key="ac" address-space-key="data" offset="0x688"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x688"/>
             <signals>
                 <signal pad-id="pd5" index="0" function="AC1" group="N"/>
                 <signal pad-id="pd7" index="2" function="AC1" group="N"/>
@@ -64,7 +64,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
-            <register-group-instance key="ac2" name="AC2" register-group-key="ac" address-space-key="data" offset="0x690"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x690"/>
             <signals>
                 <signal pad-id="pd7" index="0" function="AC2" group="N"/>
                 <signal pad-id="pd7" index="2" function="AC2" group="N"/>
@@ -75,7 +75,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
                 <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
@@ -89,10 +89,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
@@ -112,7 +112,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKOUT"/>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
@@ -123,22 +123,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="chip_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -148,22 +148,22 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="chip_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="chip_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="mvio" name="MVIO" module-key="io_multiv_ctrl_avr_v1">
-            <register-group-instance key="mvio" name="MVIO" register-group-key="mvio" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="mvio" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="opamp" name="OPAMP" module-key="amp_opamp_ctrl_avr_v1">
-            <register-group-instance key="opamp" name="OPAMP" register-group-key="opamp" address-space-key="data" offset="0x700"/>
+            <register-group-instance register-group-key="opamp" address-space-key="data" offset="0x700"/>
             <signals>
                 <signal pad-id="pd3" function="OPAMP" group="OP0INN"/>
                 <signal pad-id="pd1" function="OPAMP" group="OP0INP"/>
@@ -174,7 +174,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -187,7 +187,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -196,7 +196,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
@@ -208,7 +208,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -216,25 +216,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="chip_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_avr_v2">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -243,7 +243,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
-            <register-group-instance key="spi1" name="SPI1" register-group-key="spi" address-space-key="data" offset="0x960"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x960"/>
             <signals>
                 <signal pad-id="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
                 <signal pad-id="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
@@ -252,10 +252,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -277,25 +277,25 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
@@ -306,7 +306,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pc3" function="I2C0_ALT" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -315,7 +315,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -328,7 +328,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -337,35 +337,35 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
-            <register-group-instance key="usart2" name="USART2" register-group-key="usart" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
                 <signal pad-id="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="chip_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xB0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd0" name="ZCD0" register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
             <signals>
                 <signal pad-id="pd1" function="ZCD0" group="IN"/>
                 <signal pad-id="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB32.xml
index f4f0fe20..6fdf4c86 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB32.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd7" index="2" function="AC0" group="N"/>
@@ -52,7 +52,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
-            <register-group-instance key="ac1" name="AC1" register-group-key="ac" address-space-key="data" offset="0x688"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x688"/>
             <signals>
                 <signal pad-id="pd5" index="0" function="AC1" group="N"/>
                 <signal pad-id="pd7" index="2" function="AC1" group="N"/>
@@ -64,7 +64,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
-            <register-group-instance key="ac2" name="AC2" register-group-key="ac" address-space-key="data" offset="0x690"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x690"/>
             <signals>
                 <signal pad-id="pd7" index="0" function="AC2" group="N"/>
                 <signal pad-id="pd7" index="2" function="AC2" group="N"/>
@@ -75,7 +75,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
                 <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
@@ -93,10 +93,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
@@ -118,7 +118,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKOUT"/>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
@@ -129,22 +129,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="chip_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -155,22 +155,22 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="chip_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="chip_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="mvio" name="MVIO" module-key="io_multiv_ctrl_avr_v1">
-            <register-group-instance key="mvio" name="MVIO" register-group-key="mvio" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="mvio" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="opamp" name="OPAMP" module-key="amp_opamp_ctrl_avr_v1">
-            <register-group-instance key="opamp" name="OPAMP" register-group-key="opamp" address-space-key="data" offset="0x700"/>
+            <register-group-instance register-group-key="opamp" address-space-key="data" offset="0x700"/>
             <signals>
                 <signal pad-id="pd3" function="OPAMP" group="OP0INN"/>
                 <signal pad-id="pd1" function="OPAMP" group="OP0INP"/>
@@ -181,7 +181,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -194,7 +194,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -203,7 +203,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
@@ -215,7 +215,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -227,25 +227,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="chip_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_avr_v2">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -254,7 +254,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
-            <register-group-instance key="spi1" name="SPI1" register-group-key="spi" address-space-key="data" offset="0x960"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x960"/>
             <signals>
                 <signal pad-id="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
                 <signal pad-id="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
@@ -263,10 +263,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -292,27 +292,27 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
@@ -325,7 +325,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pc3" function="I2C0_ALT" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -334,14 +334,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi1" name="TWI1" register-group-key="twi" address-space-key="data" offset="0x920"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x920"/>
             <signals>
                 <signal pad-id="pf3" function="I2C1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
                 <signal pad-id="pf2" function="I2C1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -354,7 +354,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -363,7 +363,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
-            <register-group-instance key="usart2" name="USART2" register-group-key="usart" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
                 <signal pad-id="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
@@ -374,28 +374,28 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="chip_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xB0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd0" name="ZCD0" register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
             <signals>
                 <signal pad-id="pd1" function="ZCD0" group="IN"/>
                 <signal pad-id="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB48.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB48.xml
index c0c90946..b699c76a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB48.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC0" group="N"/>
@@ -56,7 +56,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
-            <register-group-instance key="ac1" name="AC1" register-group-key="ac" address-space-key="data" offset="0x688"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x688"/>
             <signals>
                 <signal pad-id="pd5" index="0" function="AC1" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC1" group="N"/>
@@ -70,7 +70,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
-            <register-group-instance key="ac2" name="AC2" register-group-key="ac" address-space-key="data" offset="0x690"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x690"/>
             <signals>
                 <signal pad-id="pd7" index="0" function="AC2" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC2" group="N"/>
@@ -84,7 +84,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
@@ -107,10 +107,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
@@ -138,7 +138,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKOUT"/>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
@@ -149,22 +149,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="chip_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -178,22 +178,22 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="chip_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="chip_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="mvio" name="MVIO" module-key="io_multiv_ctrl_avr_v1">
-            <register-group-instance key="mvio" name="MVIO" register-group-key="mvio" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="mvio" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="opamp" name="OPAMP" module-key="amp_opamp_ctrl_avr_v1">
-            <register-group-instance key="opamp" name="OPAMP" register-group-key="opamp" address-space-key="data" offset="0x700"/>
+            <register-group-instance register-group-key="opamp" address-space-key="data" offset="0x700"/>
             <signals>
                 <signal pad-id="pd3" function="OPAMP" group="OP0INN"/>
                 <signal pad-id="pd1" function="OPAMP" group="OP0INP"/>
@@ -207,7 +207,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -220,7 +220,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -231,7 +231,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -244,7 +244,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
@@ -257,7 +257,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pe1" index="1" function="IOPORT" group="PIN"/>
@@ -266,7 +266,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -278,25 +278,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="chip_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_avr_v2">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pe1" function="SPI0_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -309,7 +309,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
-            <register-group-instance key="spi1" name="SPI1" register-group-key="spi" address-space-key="data" offset="0x960"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x960"/>
             <signals>
                 <signal pad-id="pc5" function="SPI1_ALT2" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
                 <signal pad-id="pb5" function="SPI1_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
@@ -324,10 +324,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pe0" index="0" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -366,7 +366,7 @@
             </signals>
         </peripheral>
         <peripheral key="tca1" name="TCA1" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca1" name="TCA1" register-group-key="tca" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pc4" index="0" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
                 <signal pad-id="pb0" index="0" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
@@ -380,35 +380,35 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
             <signals>
                 <signal pad-id="pb4" index="0" function="TCB2_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcb3" name="TCB3" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb3" name="TCB3" register-group-key="tcb" address-space-key="data" offset="0xB30"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB30"/>
             <signals>
                 <signal pad-id="pc1" index="0" function="TCB3_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
                 <signal pad-id="pb5" index="0" function="TCB3" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pb4" function="TCD0_ALT" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
@@ -423,7 +423,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pc7" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pc3" function="I2C0_ALT" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -434,7 +434,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi1" name="TWI1" register-group-key="twi" address-space-key="data" offset="0x920"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x920"/>
             <signals>
                 <signal pad-id="pb3" function="I2C1_ALT" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
                 <signal pad-id="pf3" function="I2C1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
@@ -443,7 +443,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -456,7 +456,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc5" function="USART1_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -469,7 +469,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
-            <register-group-instance key="usart2" name="USART2" register-group-key="usart" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
                 <signal pad-id="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
@@ -480,7 +480,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="uart_autobd_v4">
-            <register-group-instance key="usart3" name="USART3" register-group-key="usart" address-space-key="data" offset="0x860"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x860"/>
             <signals>
                 <signal pad-id="pb5" function="USART3_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
                 <signal pad-id="pb1" function="USART3" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
@@ -491,7 +491,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart4" name="USART4" module-key="uart_autobd_v4">
-            <register-group-instance key="usart4" name="USART4" register-group-key="usart" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pe1" function="USART4" group="RXD" field="PORTMUX.USARTROUTEB.USART4"/>
                 <signal pad-id="pe0" function="USART4" group="TXD" field="PORTMUX.USARTROUTEB.USART4"/>
@@ -500,34 +500,34 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vporte" name="VPORTE" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vporte" name="VPORTE" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="chip_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xB0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd0" name="ZCD0" register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
             <signals>
                 <signal pad-id="pd1" function="ZCD0" group="IN"/>
                 <signal pad-id="pc7" function="ZCD0_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
@@ -535,7 +535,7 @@
             </signals>
         </peripheral>
         <peripheral key="zcd1" name="ZCD1" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd1" name="ZCD1" register-group-key="zcd" address-space-key="data" offset="0x6C8"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6C8"/>
             <signals>
                 <signal pad-id="pe3" function="ZCD1" group="IN"/>
                 <signal pad-id="pc7" function="ZCD1_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
@@ -543,7 +543,7 @@
             </signals>
         </peripheral>
         <peripheral key="zcd2" name="ZCD2" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd2" name="ZCD2" register-group-key="zcd" address-space-key="data" offset="0x6D0"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6D0"/>
             <signals>
                 <signal pad-id="pc7" function="ZCD2_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD2"/>
                 <signal pad-id="pa7" function="ZCD2" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD2"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB64.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB64.xml
index b7dba828..8ea068b8 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB64.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB64.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC0" group="N"/>
@@ -56,7 +56,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
-            <register-group-instance key="ac1" name="AC1" register-group-key="ac" address-space-key="data" offset="0x688"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x688"/>
             <signals>
                 <signal pad-id="pd5" index="0" function="AC1" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC1" group="N"/>
@@ -70,7 +70,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
-            <register-group-instance key="ac2" name="AC2" register-group-key="ac" address-space-key="data" offset="0x690"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x690"/>
             <signals>
                 <signal pad-id="pd7" index="0" function="AC2" group="N"/>
                 <signal pad-id="pd0" index="1" function="AC2" group="N"/>
@@ -84,7 +84,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
@@ -111,10 +111,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
@@ -148,7 +148,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKOUT"/>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
@@ -159,22 +159,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="chip_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -192,22 +192,22 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="chip_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="chip_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="mvio" name="MVIO" module-key="io_multiv_ctrl_avr_v1">
-            <register-group-instance key="mvio" name="MVIO" register-group-key="mvio" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="mvio" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="opamp" name="OPAMP" module-key="amp_opamp_ctrl_avr_v1">
-            <register-group-instance key="opamp" name="OPAMP" register-group-key="opamp" address-space-key="data" offset="0x700"/>
+            <register-group-instance register-group-key="opamp" address-space-key="data" offset="0x700"/>
             <signals>
                 <signal pad-id="pd3" function="OPAMP" group="OP0INN"/>
                 <signal pad-id="pd1" function="OPAMP" group="OP0INP"/>
@@ -221,7 +221,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -234,7 +234,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -247,7 +247,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -260,7 +260,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
@@ -273,7 +273,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pe1" index="1" function="IOPORT" group="PIN"/>
@@ -286,7 +286,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -298,7 +298,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" register-group-key="port" address-space-key="data" offset="0x4C0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4C0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pg1" index="1" function="IOPORT" group="PIN"/>
@@ -311,25 +311,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="chip_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_avr_v2">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pg5" function="SPI0_ALT2" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pe1" function="SPI0_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -346,7 +346,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
-            <register-group-instance key="spi1" name="SPI1" register-group-key="spi" address-space-key="data" offset="0x960"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x960"/>
             <signals>
                 <signal pad-id="pc5" function="SPI1_ALT2" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
                 <signal pad-id="pb5" function="SPI1_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
@@ -363,10 +363,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -413,7 +413,7 @@
             </signals>
         </peripheral>
         <peripheral key="tca1" name="TCA1" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca1" name="TCA1" register-group-key="tca" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
                 <signal pad-id="pe4" index="0" function="TCA1_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
@@ -436,42 +436,42 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
             <signals>
                 <signal pad-id="pb4" index="0" function="TCB2_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcb3" name="TCB3" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb3" name="TCB3" register-group-key="tcb" address-space-key="data" offset="0xB30"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB30"/>
             <signals>
                 <signal pad-id="pc1" index="0" function="TCB3_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
                 <signal pad-id="pb5" index="0" function="TCB3" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
             </signals>
         </peripheral>
         <peripheral key="tcb4" name="TCB4" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb4" name="TCB4" register-group-key="tcb" address-space-key="data" offset="0xB40"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB40"/>
             <signals>
                 <signal pad-id="pc6" index="0" function="TCB4_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB4"/>
                 <signal pad-id="pg3" index="0" function="TCB4" group="WO" field="PORTMUX.TCBROUTEA.TCB4"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pg4" function="TCD0_ALT3" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
@@ -492,7 +492,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pc7" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pc3" function="I2C0_ALT" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -503,7 +503,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="i2c_8bit_v2">
-            <register-group-instance key="twi1" name="TWI1" register-group-key="twi" address-space-key="data" offset="0x920"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x920"/>
             <signals>
                 <signal pad-id="pb7" function="I2C1_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
                 <signal pad-id="pb3" function="I2C1_ALT" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
@@ -514,7 +514,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -527,7 +527,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc5" function="USART1_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -540,7 +540,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
-            <register-group-instance key="usart2" name="USART2" register-group-key="usart" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
                 <signal pad-id="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
@@ -551,7 +551,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="uart_autobd_v4">
-            <register-group-instance key="usart3" name="USART3" register-group-key="usart" address-space-key="data" offset="0x860"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x860"/>
             <signals>
                 <signal pad-id="pb5" function="USART3_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
                 <signal pad-id="pb1" function="USART3" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
@@ -564,7 +564,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart4" name="USART4" module-key="uart_autobd_v4">
-            <register-group-instance key="usart4" name="USART4" register-group-key="usart" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pe5" function="USART4_ALT" group="RXD" field="PORTMUX.USARTROUTEB.USART4"/>
                 <signal pad-id="pe1" function="USART4" group="RXD" field="PORTMUX.USARTROUTEB.USART4"/>
@@ -577,7 +577,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart5" name="USART5" module-key="uart_autobd_v4">
-            <register-group-instance key="usart5" name="USART5" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pg5" function="USART5_ALT" group="RXD" field="PORTMUX.USARTROUTEB.USART5"/>
                 <signal pad-id="pg1" function="USART5" group="RXD" field="PORTMUX.USARTROUTEB.USART5"/>
@@ -590,37 +590,37 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vporte" name="VPORTE" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vporte" name="VPORTE" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vportg" name="VPORTG" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportg" name="VPORTG" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="chip_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xB0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd0" name="ZCD0" register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6C0"/>
             <signals>
                 <signal pad-id="pd1" function="ZCD0" group="IN"/>
                 <signal pad-id="pc7" function="ZCD0_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
@@ -628,7 +628,7 @@
             </signals>
         </peripheral>
         <peripheral key="zcd1" name="ZCD1" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd1" name="ZCD1" register-group-key="zcd" address-space-key="data" offset="0x6C8"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6C8"/>
             <signals>
                 <signal pad-id="pe3" function="ZCD1" group="IN"/>
                 <signal pad-id="pc7" function="ZCD1_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
@@ -636,7 +636,7 @@
             </signals>
         </peripheral>
         <peripheral key="zcd2" name="ZCD2" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd2" name="ZCD2" register-group-key="zcd" address-space-key="data" offset="0x6D0"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6D0"/>
             <signals>
                 <signal pad-id="pe7" function="ZCD2" group="IN"/>
                 <signal pad-id="pc7" function="ZCD2_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD2"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD14.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD14.xml
index a0b0d21a..66303f90 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD14.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD14.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd7" index="2" function="AC0" group="N"/>
                 <signal pad-id="pc2" index="3" function="AC0" group="N"/>
@@ -51,7 +51,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
                 <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
@@ -63,10 +63,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
@@ -81,7 +81,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
                 <signal pad-id="pa0" function="CLKCTRL_ALT1" group="XTAL32K1"/>
@@ -91,22 +91,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="chip_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
                 <signal pad-id="pd7" index="3" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
@@ -114,29 +114,29 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="chip_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="chip_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="mvio" name="MVIO" module-key="io_multiv_ctrl_avr_v1">
-            <register-group-instance key="mvio" name="MVIO" register-group-key="mvio" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="mvio" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
@@ -144,7 +144,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
@@ -153,32 +153,32 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="chip_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_avr_v2">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pc2" function="SPI0_ALT6" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pc1" function="SPI0_ALT5" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -197,10 +197,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -212,23 +212,23 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pd4" index="2" function="TCD0_ALT4" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pd5" index="3" function="TCD0_ALT4" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_avr_v3">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pa0" function="I2C0_ALT3" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -237,7 +237,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc2" function="USART0_ALT4" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pd5" function="USART0_ALT3" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -251,7 +251,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pd7" function="USART1_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -261,28 +261,28 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="chip_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xB0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd3" name="ZCD3" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd3" name="ZCD3" register-group-key="zcd" address-space-key="data" offset="0x6D8"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6D8"/>
             <signals>
                 <signal pad-id="pc2" function="ZCD3" group="IN" field="PORTMUX.ZCDROUTEA.ZCD3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD20.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD20.xml
index fd5aba9a..b65e6dab 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD20.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD20.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd7" index="2" function="AC0" group="N"/>
                 <signal pad-id="pc2" index="3" function="AC0" group="N"/>
@@ -52,7 +52,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
                 <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
@@ -70,10 +70,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
@@ -92,7 +92,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKOUT"/>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
@@ -103,22 +103,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="chip_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -128,22 +128,22 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="chip_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="chip_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="mvio" name="MVIO" module-key="io_multiv_ctrl_avr_v1">
-            <register-group-instance key="mvio" name="MVIO" register-group-key="mvio" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="mvio" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -156,7 +156,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
@@ -164,7 +164,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
@@ -173,32 +173,32 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="chip_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_avr_v2">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pc2" function="SPI0_ALT6" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pc1" function="SPI0_ALT5" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -221,10 +221,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -240,22 +240,22 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pa4" function="TCD0_ALT4" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
@@ -268,7 +268,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_avr_v3">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pa0" function="I2C0_ALT3" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -281,7 +281,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc2" function="USART0_ALT4" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pd5" function="USART0_ALT3" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -303,7 +303,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pd7" function="USART1_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -313,28 +313,28 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="chip_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xB0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd3" name="ZCD3" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd3" name="ZCD3" register-group-key="zcd" address-space-key="data" offset="0x6D8"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6D8"/>
             <signals>
                 <signal pad-id="pc2" function="ZCD3" group="IN" field="PORTMUX.ZCDROUTEA.ZCD3"/>
                 <signal pad-id="pa7" function="ZCD3" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD3"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD28.xml
index ba9d9b63..d73277e3 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD28.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd7" index="2" function="AC0" group="N"/>
@@ -54,7 +54,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
                 <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
@@ -78,10 +78,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
@@ -109,7 +109,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKOUT"/>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
@@ -122,22 +122,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="chip_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -148,22 +148,22 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="chip_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="chip_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="mvio" name="MVIO" module-key="io_multiv_ctrl_avr_v1">
-            <register-group-instance key="mvio" name="MVIO" register-group-key="mvio" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="mvio" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -176,7 +176,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -185,7 +185,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
@@ -197,7 +197,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -206,25 +206,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="chip_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_avr_v2">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pc2" function="SPI0_ALT6" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pc1" function="SPI0_ALT5" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -249,10 +249,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -274,25 +274,25 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pa4" function="TCD0_ALT4" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
@@ -307,7 +307,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_avr_v3">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pa0" function="I2C0_ALT3" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -320,7 +320,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc2" function="USART0_ALT4" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pd5" function="USART0_ALT3" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -342,7 +342,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pd7" function="USART1_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -353,28 +353,28 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="chip_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xB0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd3" name="ZCD3" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd3" name="ZCD3" register-group-key="zcd" address-space-key="data" offset="0x6D8"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6D8"/>
             <signals>
                 <signal pad-id="pc2" function="ZCD3" group="IN" field="PORTMUX.ZCDROUTEA.ZCD3"/>
                 <signal pad-id="pa7" function="ZCD3" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD3"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD32.xml
index 0f6001e8..605f35ef 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD32.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd7" index="2" function="AC0" group="N"/>
@@ -54,7 +54,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
                 <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
@@ -82,10 +82,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
@@ -115,7 +115,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKOUT"/>
                 <signal pad-id="pa0" function="CLKCTRL" group="EXTCLK"/>
@@ -128,22 +128,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="chip_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -155,22 +155,22 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="chip_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="chip_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="mvio" name="MVIO" module-key="io_multiv_ctrl_avr_v1">
-            <register-group-instance key="mvio" name="MVIO" register-group-key="mvio" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="mvio" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v1">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -183,7 +183,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -192,7 +192,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
@@ -204,7 +204,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -217,25 +217,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="chip_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_avr_v2">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pc2" function="SPI0_ALT6" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pc1" function="SPI0_ALT5" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -260,10 +260,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -289,27 +289,27 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf4" index="0" function="TCB0_ALT1" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pf5" index="0" function="TCB1_ALT1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xB80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xB80"/>
             <signals>
                 <signal pad-id="pa4" function="TCD0_ALT4" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
                 <signal pad-id="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
@@ -326,7 +326,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_avr_v3">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pa0" function="I2C0_ALT3" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -339,7 +339,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc2" function="USART0_ALT4" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pd5" function="USART0_ALT3" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -361,7 +361,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pd7" function="USART1_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -372,28 +372,28 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_avr_v2_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="chip_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xB0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="zcd3" name="ZCD3" module-key="cmp_zxover_ctrl_v3">
-            <register-group-instance key="zcd3" name="ZCD3" register-group-key="zcd" address-space-key="data" offset="0x6D8"/>
+            <register-group-instance register-group-key="zcd" address-space-key="data" offset="0x6D8"/>
             <signals>
                 <signal pad-id="pc2" function="ZCD3" group="IN" field="PORTMUX.ZCDROUTEA.ZCD3"/>
                 <signal pad-id="pa7" function="ZCD3" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD3"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA28.xml b/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA28.xml
index edbe612a..347b158d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA28.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AINN" group="AINN"/>
                 <signal pad-id="pd0" index="1" function="AINN" group="AINN"/>
@@ -55,7 +55,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
-            <register-group-instance key="ac1" name="AC1" register-group-key="ac" address-space-key="data" offset="0x688"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x688"/>
             <signals>
                 <signal pad-id="pd5" index="0" function="AINN" group="AINN"/>
                 <signal pad-id="pd0" index="1" function="AINN" group="AINN"/>
@@ -69,7 +69,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_avr_v2">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="AINN" group="AINN"/>
                 <signal pad-id="pd1" index="1" function="AINN" group="AINN"/>
@@ -114,10 +114,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_avr_v2">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IN" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="IN" group="LUT0_IN"/>
@@ -138,7 +138,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrea_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa0" function="EXTCLK" group="EXTCLK"/>
                 <signal pad-id="pa7" function="OUT" group="CLKOUT"/>
@@ -149,22 +149,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_avr_v6">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" function="VOUT" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrea_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="DEFAULT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -175,19 +175,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrea_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="avrea_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="avrea_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v3">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -200,7 +200,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -209,7 +209,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
@@ -222,7 +222,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -231,25 +231,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrea_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_avr_v2">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_avr_v2">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="avrea_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_avr_v1">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pa1" function="ALT3" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pa0" function="ALT3" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -274,10 +274,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrea_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pc1" index="1" function="ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -300,25 +300,25 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pa2" index="0" function="DEFAULT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pa3" index="0" function="DEFAULT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="DEFAULT" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_avr_v3">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pa3" function="ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pa2" function="ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -335,7 +335,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa5" index="1" function="ALT1" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa4" index="1" function="ALT1" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -357,7 +357,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pd7" function="ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pd6" function="ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -368,35 +368,35 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
-            <register-group-instance key="usart2" name="USART2" register-group-key="usart" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pf1" function="DEFAULT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
                 <signal pad-id="pf0" function="DEFAULT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrea_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_avr_v3_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_avr_v3_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_avr_v3_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_avr_v3_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="avrea_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pd7" function="VREF" group="VREFA"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA32.xml b/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA32.xml
index 5a19513c..7563a3b8 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA32.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AINN" group="AINN"/>
                 <signal pad-id="pd0" index="1" function="AINN" group="AINN"/>
@@ -55,7 +55,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
-            <register-group-instance key="ac1" name="AC1" register-group-key="ac" address-space-key="data" offset="0x688"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x688"/>
             <signals>
                 <signal pad-id="pd5" index="0" function="AINN" group="AINN"/>
                 <signal pad-id="pd0" index="1" function="AINN" group="AINN"/>
@@ -69,7 +69,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_avr_v2">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="AINN" group="AINN"/>
                 <signal pad-id="pd1" index="1" function="AINN" group="AINN"/>
@@ -122,10 +122,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_avr_v2">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IN" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="IN" group="LUT0_IN"/>
@@ -148,7 +148,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrea_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa0" function="EXTCLK" group="EXTCLK"/>
                 <signal pad-id="pa7" function="OUT" group="CLKOUT"/>
@@ -159,22 +159,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_avr_v6">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" function="VOUT" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrea_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="DEFAULT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -186,19 +186,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrea_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="avrea_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="avrea_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v3">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -211,7 +211,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -220,7 +220,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
@@ -233,7 +233,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -246,25 +246,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrea_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_avr_v2">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_avr_v2">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="avrea_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_avr_v1">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pa1" function="ALT3" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pa0" function="ALT3" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -289,10 +289,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrea_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pc1" index="1" function="ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -319,27 +319,27 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf4" index="0" function="ALT1" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
                 <signal pad-id="pa2" index="0" function="DEFAULT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pf5" index="0" function="ALT1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
                 <signal pad-id="pa3" index="0" function="DEFAULT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="DEFAULT" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_avr_v3">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pa3" function="ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pa2" function="ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -356,7 +356,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa5" index="1" function="ALT1" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa4" index="1" function="ALT1" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -378,7 +378,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pd7" function="ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pd6" function="ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -389,7 +389,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
-            <register-group-instance key="usart2" name="USART2" register-group-key="usart" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pf5" function="ALT1" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
                 <signal pad-id="pf4" function="ALT1" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
@@ -400,28 +400,28 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrea_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_avr_v3_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_avr_v3_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_avr_v3_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_avr_v3_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="avrea_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pd7" function="VREF" group="VREFA"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA48.xml b/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA48.xml
index 436a17a9..3db3e8eb 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA48.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AINN" group="AINN"/>
                 <signal pad-id="pd0" index="1" function="AINN" group="AINN"/>
@@ -58,7 +58,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
-            <register-group-instance key="ac1" name="AC1" register-group-key="ac" address-space-key="data" offset="0x688"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x688"/>
             <signals>
                 <signal pad-id="pd5" index="0" function="AINN" group="AINN"/>
                 <signal pad-id="pd0" index="1" function="AINN" group="AINN"/>
@@ -73,7 +73,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_avr_v2">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="AINN" group="AINN"/>
                 <signal pad-id="pd1" index="1" function="AINN" group="AINN"/>
@@ -134,10 +134,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_avr_v2">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IN" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="IN" group="LUT0_IN"/>
@@ -161,7 +161,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrea_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa0" function="EXTCLK" group="EXTCLK"/>
                 <signal pad-id="pa7" function="OUT" group="CLKOUT"/>
@@ -172,22 +172,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_avr_v6">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pd6" function="VOUT" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrea_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="DEFAULT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -202,19 +202,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrea_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1050"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1050"/>
         </peripheral>
         <peripheral key="gpr" name="GPR" module-key="avrea_gpr">
-            <register-group-instance key="gpr" name="GPR" register-group-key="gpr" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpr" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lock" name="LOCK" module-key="avrea_lock">
-            <register-group-instance key="lock" name="LOCK" register-group-key="lock" address-space-key="data" offset="0x1040"/>
+            <register-group-instance register-group-key="lock" address-space-key="data" offset="0x1040"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v3">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -227,7 +227,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -238,7 +238,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -251,7 +251,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
@@ -264,7 +264,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pe1" index="1" function="IOPORT" group="PIN"/>
@@ -273,7 +273,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -286,25 +286,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrea_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_avr_v2">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_avr_v2">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="avrea_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_avr_v1">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pe1" function="ALT1" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pe0" function="ALT1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -333,10 +333,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrea_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="ALT1" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pb1" index="1" function="ALT1" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -375,7 +375,7 @@
             </signals>
         </peripheral>
         <peripheral key="tca1" name="TCA1" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca1" name="TCA1" register-group-key="tca" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pc4" index="0" function="ALT1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
                 <signal pad-id="pc5" index="1" function="ALT1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
@@ -395,35 +395,35 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf4" index="0" function="ALT1" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
                 <signal pad-id="pa2" index="0" function="DEFAULT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xB10"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB10"/>
             <signals>
                 <signal pad-id="pf5" index="0" function="ALT1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
                 <signal pad-id="pa3" index="0" function="DEFAULT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xB20"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB20"/>
             <signals>
                 <signal pad-id="pb4" index="0" function="ALT1" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
                 <signal pad-id="pc0" index="0" function="DEFAULT" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcb3" name="TCB3" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb3" name="TCB3" register-group-key="tcb" address-space-key="data" offset="0xB30"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xB30"/>
             <signals>
                 <signal pad-id="pc1" index="0" function="ALT1" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
                 <signal pad-id="pb5" index="0" function="DEFAULT" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_avr_v3">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pa3" function="ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
                 <signal pad-id="pc7" function="ALT1" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
@@ -444,7 +444,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa5" index="1" function="ALT1" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa4" index="1" function="ALT1" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -466,7 +466,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc5" function="ALT1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc4" function="ALT1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -481,7 +481,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
-            <register-group-instance key="usart2" name="USART2" register-group-key="usart" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pf5" function="ALT1" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
                 <signal pad-id="pf4" function="ALT1" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
@@ -492,34 +492,34 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrea_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1080"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1080"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_avr_v3_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="gpio_ports_avr_v3_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_avr_v3_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="gpio_ports_avr_v3_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vporte" name="VPORTE" module-key="gpio_ports_avr_v3_vport">
-            <register-group-instance key="vporte" name="VPORTE" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="gpio_ports_avr_v3_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="avrea_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pd7" function="VREF" group="VREFA"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN128.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN128.xml
index 856d3dd4..39bbc1ce 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN128.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN128.xml
@@ -193,7 +193,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -206,7 +206,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -219,7 +219,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -232,7 +232,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -245,7 +245,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="P"/>
                 <signal pad-id="pe1" index="1" function="default" group="P"/>
@@ -258,7 +258,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="P"/>
                 <signal pad-id="pf1" index="1" function="default" group="P"/>
@@ -271,7 +271,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="default" group="P"/>
                 <signal pad-id="pg1" index="1" function="default" group="P"/>
@@ -284,7 +284,7 @@
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf4" function="default" group="TCK"/>
                 <signal pad-id="pf5" function="default" group="TMS"/>
@@ -293,7 +293,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="SS"/>
                 <signal pad-id="pb2" function="default" group="MOSI"/>
@@ -302,14 +302,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="SDA"/>
                 <signal pad-id="pd0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe1" function="default" group="TXD"/>
                 <signal pad-id="pe0" function="default" group="RXD"/>
@@ -317,7 +317,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" function="default" group="TXD"/>
                 <signal pad-id="pd2" function="default" group="RXD"/>
@@ -325,16 +325,16 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc7" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="INT"/>
                 <signal pad-id="pd1" index="1" function="default" group="INT"/>
@@ -347,17 +347,17 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd7" function="default" group="T"/>
                 <signal pad-id="pb7" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd6" function="default" group="T"/>
                 <signal pad-id="pd4" function="default" group="ICP"/>
@@ -367,7 +367,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
-            <register-group-instance key="tc3" name="TC3" description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe6" function="default" group="T"/>
                 <signal pad-id="pe7" function="default" group="ICP"/>
@@ -377,7 +377,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg4" index="1" function="default" group="TOSC"/>
                 <signal pad-id="pg3" index="2" function="default" group="TOSC"/>
@@ -385,10 +385,10 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="default" group="ADC"/>
@@ -401,24 +401,24 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="can" name="CAN" module-key="can">
-            <register-group-instance key="can" name="CAN" description="Controller Area Network" register-group-key="can" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Controller Area Network" register-group-key="can" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd5" function="default" group="TXCAN"/>
                 <signal pad-id="pd6" function="default" group="RXCAN"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN32.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN32.xml
index ba428e80..4972e377 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN32.xml
@@ -193,7 +193,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -206,7 +206,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -219,7 +219,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -232,7 +232,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -245,7 +245,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="P"/>
                 <signal pad-id="pe1" index="1" function="default" group="P"/>
@@ -258,7 +258,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="P"/>
                 <signal pad-id="pf1" index="1" function="default" group="P"/>
@@ -271,7 +271,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="default" group="P"/>
                 <signal pad-id="pg1" index="1" function="default" group="P"/>
@@ -284,7 +284,7 @@
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf4" function="default" group="TCK"/>
                 <signal pad-id="pf5" function="default" group="TMS"/>
@@ -293,7 +293,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="SS"/>
                 <signal pad-id="pb2" function="default" group="MOSI"/>
@@ -302,14 +302,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="SDA"/>
                 <signal pad-id="pd0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe1" function="default" group="TXD"/>
                 <signal pad-id="pe0" function="default" group="RXD"/>
@@ -317,7 +317,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" function="default" group="TXD"/>
                 <signal pad-id="pd2" function="default" group="RXD"/>
@@ -325,16 +325,16 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc7" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="INT"/>
                 <signal pad-id="pd1" index="1" function="default" group="INT"/>
@@ -347,17 +347,17 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd7" function="default" group="T"/>
                 <signal pad-id="pb7" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd6" function="default" group="T"/>
                 <signal pad-id="pd4" function="default" group="ICP"/>
@@ -367,7 +367,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
-            <register-group-instance key="tc3" name="TC3" description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe6" function="default" group="T"/>
                 <signal pad-id="pe7" function="default" group="ICP"/>
@@ -377,7 +377,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg4" index="1" function="default" group="TOSC"/>
                 <signal pad-id="pg3" index="2" function="default" group="TOSC"/>
@@ -385,10 +385,10 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="default" group="ADC"/>
@@ -401,24 +401,24 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="can" name="CAN" module-key="can">
-            <register-group-instance key="can" name="CAN" description="Controller Area Network" register-group-key="can" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Controller Area Network" register-group-key="can" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd5" function="default" group="TXCAN"/>
                 <signal pad-id="pd6" function="default" group="RXCAN"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN64.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN64.xml
index ef814616..39fa3ba4 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN64.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN64.xml
@@ -193,7 +193,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -206,7 +206,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -219,7 +219,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -232,7 +232,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -245,7 +245,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="P"/>
                 <signal pad-id="pe1" index="1" function="default" group="P"/>
@@ -258,7 +258,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="P"/>
                 <signal pad-id="pf1" index="1" function="default" group="P"/>
@@ -271,7 +271,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="default" group="P"/>
                 <signal pad-id="pg1" index="1" function="default" group="P"/>
@@ -284,7 +284,7 @@
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf4" function="default" group="TCK"/>
                 <signal pad-id="pf5" function="default" group="TMS"/>
@@ -293,7 +293,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="SS"/>
                 <signal pad-id="pb2" function="default" group="MOSI"/>
@@ -302,14 +302,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="SDA"/>
                 <signal pad-id="pd0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe1" function="default" group="TXD"/>
                 <signal pad-id="pe0" function="default" group="RXD"/>
@@ -317,7 +317,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" function="default" group="TXD"/>
                 <signal pad-id="pd2" function="default" group="RXD"/>
@@ -325,16 +325,16 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc7" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="INT"/>
                 <signal pad-id="pd1" index="1" function="default" group="INT"/>
@@ -347,17 +347,17 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd7" function="default" group="T"/>
                 <signal pad-id="pb7" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd6" function="default" group="T"/>
                 <signal pad-id="pd4" function="default" group="ICP"/>
@@ -367,7 +367,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
-            <register-group-instance key="tc3" name="TC3" description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe6" function="default" group="T"/>
                 <signal pad-id="pe7" function="default" group="ICP"/>
@@ -377,7 +377,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg4" index="1" function="default" group="TOSC"/>
                 <signal pad-id="pg3" index="2" function="default" group="TOSC"/>
@@ -385,10 +385,10 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="default" group="ADC"/>
@@ -401,24 +401,24 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="can" name="CAN" module-key="can">
-            <register-group-instance key="can" name="CAN" description="Controller Area Network" register-group-key="can" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Controller Area Network" register-group-key="can" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd5" function="default" group="TXCAN"/>
                 <signal pad-id="pd6" function="default" group="RXCAN"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM1.xml
index 1dcc35fb..f64172fd 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM1.xml
@@ -192,7 +192,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -205,7 +205,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -218,7 +218,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -226,49 +226,49 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="psc0" name="PSC0" module-key="psc">
-            <register-group-instance key="psc0" name="PSC0" description="Power Stage Controller" register-group-key="psc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Power Stage Controller" register-group-key="psc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="psc2" name="PSC2" module-key="psc">
-            <register-group-instance key="psc2" name="PSC2" description="Power Stage Controller" register-group-key="psc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Power Stage Controller" register-group-key="psc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="psc1" name="PSC1" module-key="psc">
-            <register-group-instance key="psc1" name="PSC1" description="Power Stage Controller" register-group-key="psc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Power Stage Controller" register-group-key="psc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM161.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM161.xml
index 6e84a888..60a9376e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM161.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM161.xml
@@ -192,7 +192,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -205,7 +205,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -218,7 +218,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -227,46 +227,46 @@
             </signals>
         </peripheral>
         <peripheral key="dac" name="DAC" module-key="dac">
-            <register-group-instance key="dac" name="DAC" description="Digital-to-Analog Converter" register-group-key="dac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Digital-to-Analog Converter" register-group-key="dac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="psc0" name="PSC0" module-key="psc">
-            <register-group-instance key="psc0" name="PSC0" description="Power Stage Controller" register-group-key="psc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Power Stage Controller" register-group-key="psc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="psc2" name="PSC2" module-key="psc">
-            <register-group-instance key="psc2" name="PSC2" description="Power Stage Controller" register-group-key="psc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Power Stage Controller" register-group-key="psc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM216.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM216.xml
index 07b44958..b777c671 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM216.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM216.xml
@@ -192,7 +192,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -205,7 +205,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -218,7 +218,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -226,55 +226,55 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eusart" name="EUSART" module-key="eusart">
-            <register-group-instance key="eusart" name="EUSART" description="Extended USART" register-group-key="eusart" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Extended USART" register-group-key="eusart" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="dac" name="DAC" module-key="dac">
-            <register-group-instance key="dac" name="DAC" description="Digital-to-Analog Converter" register-group-key="dac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Digital-to-Analog Converter" register-group-key="dac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart" name="USART" module-key="usart">
-            <register-group-instance key="usart" name="USART" description="USART" register-group-key="usart" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="psc0" name="PSC0" module-key="psc">
-            <register-group-instance key="psc0" name="PSC0" description="Power Stage Controller" register-group-key="psc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Power Stage Controller" register-group-key="psc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="psc2" name="PSC2" module-key="psc">
-            <register-group-instance key="psc2" name="PSC2" description="Power Stage Controller" register-group-key="psc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Power Stage Controller" register-group-key="psc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM2B.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM2B.xml
index 1d0771cc..2dfdc427 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM2B.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM2B.xml
@@ -192,7 +192,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -205,7 +205,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -218,7 +218,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -226,55 +226,55 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eusart" name="EUSART" module-key="eusart">
-            <register-group-instance key="eusart" name="EUSART" description="Extended USART" register-group-key="eusart" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Extended USART" register-group-key="eusart" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="dac" name="DAC" module-key="dac">
-            <register-group-instance key="dac" name="DAC" description="Digital-to-Analog Converter" register-group-key="dac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Digital-to-Analog Converter" register-group-key="dac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart" name="USART" module-key="usart">
-            <register-group-instance key="usart" name="USART" description="USART" register-group-key="usart" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="psc0" name="PSC0" module-key="psc">
-            <register-group-instance key="psc0" name="PSC0" description="Power Stage Controller" register-group-key="psc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Power Stage Controller" register-group-key="psc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="psc2" name="PSC2" module-key="psc">
-            <register-group-instance key="psc2" name="PSC2" description="Power Stage Controller" register-group-key="psc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Power Stage Controller" register-group-key="psc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM316.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM316.xml
index e75b0ba3..8e8bf3c1 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM316.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM316.xml
@@ -192,7 +192,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -205,7 +205,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -218,7 +218,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -231,7 +231,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -239,58 +239,58 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eusart" name="EUSART" module-key="eusart">
-            <register-group-instance key="eusart" name="EUSART" description="Extended USART" register-group-key="eusart" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Extended USART" register-group-key="eusart" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="dac" name="DAC" module-key="dac">
-            <register-group-instance key="dac" name="DAC" description="Digital-to-Analog Converter" register-group-key="dac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Digital-to-Analog Converter" register-group-key="dac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart" name="USART" module-key="usart">
-            <register-group-instance key="usart" name="USART" description="USART" register-group-key="usart" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="psc0" name="PSC0" module-key="psc">
-            <register-group-instance key="psc0" name="PSC0" description="Power Stage Controller" register-group-key="psc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Power Stage Controller" register-group-key="psc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="psc1" name="PSC1" module-key="psc">
-            <register-group-instance key="psc1" name="PSC1" description="Power Stage Controller" register-group-key="psc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Power Stage Controller" register-group-key="psc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="psc2" name="PSC2" module-key="psc">
-            <register-group-instance key="psc2" name="PSC2" description="Power Stage Controller" register-group-key="psc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Power Stage Controller" register-group-key="psc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM3B.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM3B.xml
index dc787615..2013b9f2 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM3B.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM3B.xml
@@ -192,7 +192,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -205,7 +205,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -218,7 +218,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -231,7 +231,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -239,58 +239,58 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eusart" name="EUSART" module-key="eusart">
-            <register-group-instance key="eusart" name="EUSART" description="Extended USART" register-group-key="eusart" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Extended USART" register-group-key="eusart" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="dac" name="DAC" module-key="dac">
-            <register-group-instance key="dac" name="DAC" description="Digital-to-Analog Converter" register-group-key="dac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Digital-to-Analog Converter" register-group-key="dac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart" name="USART" module-key="usart">
-            <register-group-instance key="usart" name="USART" description="USART" register-group-key="usart" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="psc0" name="PSC0" module-key="psc">
-            <register-group-instance key="psc0" name="PSC0" description="Power Stage Controller" register-group-key="psc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Power Stage Controller" register-group-key="psc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="psc1" name="PSC1" module-key="psc">
-            <register-group-instance key="psc1" name="PSC1" description="Power Stage Controller" register-group-key="psc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Power Stage Controller" register-group-key="psc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="psc2" name="PSC2" module-key="psc">
-            <register-group-instance key="psc2" name="PSC2" description="Power Stage Controller" register-group-key="psc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Power Stage Controller" register-group-key="psc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM81.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM81.xml
index 3589ea3f..258cb9e6 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM81.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM81.xml
@@ -192,7 +192,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -205,7 +205,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -218,7 +218,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -227,46 +227,46 @@
             </signals>
         </peripheral>
         <peripheral key="dac" name="DAC" module-key="dac">
-            <register-group-instance key="dac" name="DAC" description="Digital-to-Analog Converter" register-group-key="dac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Digital-to-Analog Converter" register-group-key="dac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="psc0" name="PSC0" module-key="psc">
-            <register-group-instance key="psc0" name="PSC0" description="Power Stage Controller" register-group-key="psc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Power Stage Controller" register-group-key="psc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="psc2" name="PSC2" module-key="psc">
-            <register-group-instance key="psc2" name="PSC2" description="Power Stage Controller" register-group-key="psc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Power Stage Controller" register-group-key="psc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1286.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1286.xml
index f0ce83af..bf6e2180 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1286.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1286.xml
@@ -193,10 +193,10 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -209,7 +209,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -222,7 +222,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -235,7 +235,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -248,7 +248,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -261,7 +261,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -274,61 +274,61 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usb_device" name="USB_DEVICE" module-key="usb_device">
-            <register-group-instance key="usb_device" name="USB_DEVICE" description="USB Device Registers" register-group-key="usb_device" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USB Device Registers" register-group-key="usb_device" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
-            <register-group-instance key="tc3" name="TC3" description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="pll" name="PLL" module-key="pll">
-            <register-group-instance key="pll" name="PLL" description="Phase Locked Loop" register-group-key="pll" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Phase Locked Loop" register-group-key="pll" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usb_global" name="USB_GLOBAL" module-key="usb_global">
-            <register-group-instance key="usb_global" name="USB_GLOBAL" description="USB Controller" register-group-key="usb_global" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USB Controller" register-group-key="usb_global" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1287.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1287.xml
index 17d7f5c5..640d132b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1287.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1287.xml
@@ -193,10 +193,10 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -209,7 +209,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -222,7 +222,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -235,7 +235,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -248,7 +248,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -261,7 +261,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -274,64 +274,64 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usb_device" name="USB_DEVICE" module-key="usb_device">
-            <register-group-instance key="usb_device" name="USB_DEVICE" description="USB Device Registers" register-group-key="usb_device" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USB Device Registers" register-group-key="usb_device" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usb_global" name="USB_GLOBAL" module-key="usb_global">
-            <register-group-instance key="usb_global" name="USB_GLOBAL" description="USB Controller" register-group-key="usb_global" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USB Controller" register-group-key="usb_global" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usb_host" name="USB_HOST" module-key="usb_host">
-            <register-group-instance key="usb_host" name="USB_HOST" description="USB Host Registers" register-group-key="usb_host" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USB Host Registers" register-group-key="usb_host" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
-            <register-group-instance key="tc3" name="TC3" description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="pll" name="PLL" module-key="pll">
-            <register-group-instance key="pll" name="PLL" description="Phase Locked Loop" register-group-key="pll" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Phase Locked Loop" register-group-key="pll" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB162.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB162.xml
index 2df8f0da..d0a9e081 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB162.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB162.xml
@@ -192,7 +192,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -205,7 +205,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -218,7 +218,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -231,49 +231,49 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="pll" name="PLL" module-key="pll">
-            <register-group-instance key="pll" name="PLL" description="Phase Locked Loop" register-group-key="pll" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Phase Locked Loop" register-group-key="pll" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usb_device" name="USB_DEVICE" module-key="usb_device">
-            <register-group-instance key="usb_device" name="USB_DEVICE" description="USB Device Registers" register-group-key="usb_device" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USB Device Registers" register-group-key="usb_device" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ps2" name="PS2" module-key="ps2">
-            <register-group-instance key="ps2" name="PS2" description="PS/2 Controller" register-group-key="ps2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="PS/2 Controller" register-group-key="ps2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB646.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB646.xml
index 67a3b853..6c9f2354 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB646.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB646.xml
@@ -193,10 +193,10 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -209,7 +209,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -222,7 +222,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -235,7 +235,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -248,7 +248,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -261,7 +261,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -274,64 +274,64 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usb_device" name="USB_DEVICE" module-key="usb_device">
-            <register-group-instance key="usb_device" name="USB_DEVICE" description="USB Device Registers" register-group-key="usb_device" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USB Device Registers" register-group-key="usb_device" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usb_global" name="USB_GLOBAL" module-key="usb_global">
-            <register-group-instance key="usb_global" name="USB_GLOBAL" description="USB Controller" register-group-key="usb_global" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USB Controller" register-group-key="usb_global" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usb_host" name="USB_HOST" module-key="usb_host">
-            <register-group-instance key="usb_host" name="USB_HOST" description="USB Host Registers" register-group-key="usb_host" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USB Host Registers" register-group-key="usb_host" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
-            <register-group-instance key="tc3" name="TC3" description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="pll" name="PLL" module-key="pll">
-            <register-group-instance key="pll" name="PLL" description="Phase Locked Loop" register-group-key="pll" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Phase Locked Loop" register-group-key="pll" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB647.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB647.xml
index ea0cbf31..9919f606 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB647.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB647.xml
@@ -193,10 +193,10 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -209,7 +209,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -222,7 +222,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -235,7 +235,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -248,7 +248,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -261,7 +261,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -274,64 +274,64 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usb_device" name="USB_DEVICE" module-key="usb_device">
-            <register-group-instance key="usb_device" name="USB_DEVICE" description="USB Device Registers" register-group-key="usb_device" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USB Device Registers" register-group-key="usb_device" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usb_global" name="USB_GLOBAL" module-key="usb_global">
-            <register-group-instance key="usb_global" name="USB_GLOBAL" description="USB Controller" register-group-key="usb_global" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USB Controller" register-group-key="usb_global" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usb_host" name="USB_HOST" module-key="usb_host">
-            <register-group-instance key="usb_host" name="USB_HOST" description="USB Host Registers" register-group-key="usb_host" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USB Host Registers" register-group-key="usb_host" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
-            <register-group-instance key="tc3" name="TC3" description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="pll" name="PLL" module-key="pll">
-            <register-group-instance key="pll" name="PLL" description="Phase Locked Loop" register-group-key="pll" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Phase Locked Loop" register-group-key="pll" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB82.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB82.xml
index 88eb4c99..49317ad1 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB82.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB82.xml
@@ -192,7 +192,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -205,7 +205,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -218,7 +218,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -231,49 +231,49 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="pll" name="PLL" module-key="pll">
-            <register-group-instance key="pll" name="PLL" description="Phase Locked Loop" register-group-key="pll" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Phase Locked Loop" register-group-key="pll" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usb_device" name="USB_DEVICE" module-key="usb_device">
-            <register-group-instance key="usb_device" name="USB_DEVICE" description="USB Device Registers" register-group-key="usb_device" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USB Device Registers" register-group-key="usb_device" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ps2" name="PS2" module-key="ps2">
-            <register-group-instance key="ps2" name="PS2" description="PS/2 Controller" register-group-key="ps2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="PS/2 Controller" register-group-key="ps2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128.xml
index ccadbb86..2aa6864a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128.xml
@@ -193,14 +193,14 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe3" index="1" function="default" group="AIN"/>
                 <signal pad-id="pe2" index="0" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb3" function="default" group="MISO"/>
                 <signal pad-id="pb2" function="default" group="MOSI"/>
@@ -209,14 +209,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="SDA"/>
                 <signal pad-id="pd0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe2" function="default" group="XCK"/>
                 <signal pad-id="pe1" function="default" group="TXD"/>
@@ -224,7 +224,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd5" function="default" group="XCK"/>
                 <signal pad-id="pd3" function="default" group="TXD"/>
@@ -232,13 +232,13 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf7" function="default" group="TDI"/>
                 <signal pad-id="pf6" function="default" group="TDO"/>
@@ -247,7 +247,7 @@
             </signals>
         </peripheral>
         <peripheral key="misc" name="MISC" module-key="misc">
-            <register-group-instance key="misc" name="MISC" description="Other Registers" register-group-key="misc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Other Registers" register-group-key="misc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa7" index="7" function="default" group="AD"/>
                 <signal pad-id="pa6" index="6" function="default" group="AD"/>
@@ -273,7 +273,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe7" index="7" function="default" group="INT"/>
                 <signal pad-id="pe6" index="6" function="default" group="INT"/>
@@ -286,10 +286,10 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -302,7 +302,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -315,7 +315,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -328,7 +328,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -341,7 +341,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="P"/>
                 <signal pad-id="pe1" index="1" function="default" group="P"/>
@@ -354,7 +354,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="P"/>
                 <signal pad-id="pf1" index="1" function="default" group="P"/>
@@ -367,7 +367,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="default" group="P"/>
                 <signal pad-id="pg1" index="1" function="default" group="P"/>
@@ -377,7 +377,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8_async">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit Async" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb4" function="default" group="OC"/>
                 <signal pad-id="pg4" index="1" function="default" group="TOSC"/>
@@ -385,7 +385,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb7" function="default" group="OCC"/>
                 <signal pad-id="pb6" function="default" group="OCB"/>
@@ -395,7 +395,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
-            <register-group-instance key="tc3" name="TC3" description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe7" function="default" group="ICP"/>
                 <signal pad-id="pe6" function="default" group="T"/>
@@ -405,17 +405,17 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb7" function="default" group="OC"/>
                 <signal pad-id="pd7" function="default" group="T"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf7" index="7" function="default" group="ADC"/>
                 <signal pad-id="pf6" index="6" function="default" group="ADC"/>
@@ -428,10 +428,10 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1280.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1280.xml
index 574b14c5..2c017615 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1280.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1280.xml
@@ -193,14 +193,14 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe1" function="default" group="TXD"/>
                 <signal pad-id="pe0" function="default" group="RXD"/>
@@ -208,7 +208,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" function="default" group="TXD"/>
                 <signal pad-id="pd2" function="default" group="RXD"/>
@@ -216,7 +216,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="usart">
-            <register-group-instance key="usart2" name="USART2" description="USART" register-group-key="usart2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="ph2" function="default" group="XCK"/>
                 <signal pad-id="ph1" function="default" group="TXD"/>
@@ -224,7 +224,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="usart">
-            <register-group-instance key="usart3" name="USART3" description="USART" register-group-key="usart3" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart3" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pj2" function="default" group="XCK"/>
                 <signal pad-id="pj1" function="default" group="TXD"/>
@@ -232,14 +232,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="SDA"/>
                 <signal pad-id="pd0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="SS"/>
                 <signal pad-id="pb2" function="default" group="MOSI"/>
@@ -248,7 +248,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -261,7 +261,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -274,7 +274,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -287,7 +287,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -300,7 +300,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="P"/>
                 <signal pad-id="pe1" index="1" function="default" group="P"/>
@@ -313,7 +313,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="P"/>
                 <signal pad-id="pf1" index="1" function="default" group="P"/>
@@ -326,7 +326,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="default" group="P"/>
                 <signal pad-id="pg1" index="1" function="default" group="P"/>
@@ -339,7 +339,7 @@
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
-            <register-group-instance key="porth" name="PORTH" description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="ph0" index="0" function="default" group="P"/>
                 <signal pad-id="ph1" index="1" function="default" group="P"/>
@@ -352,7 +352,7 @@
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
-            <register-group-instance key="portj" name="PORTJ" description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pj0" index="0" function="default" group="P"/>
                 <signal pad-id="pj1" index="1" function="default" group="P"/>
@@ -365,7 +365,7 @@
             </signals>
         </peripheral>
         <peripheral key="portk" name="PORTK" module-key="gpio_port">
-            <register-group-instance key="portk" name="PORTK" description="I/O Port" register-group-key="portk" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portk" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pk0" index="0" function="default" group="P"/>
                 <signal pad-id="pk1" index="1" function="default" group="P"/>
@@ -378,7 +378,7 @@
             </signals>
         </peripheral>
         <peripheral key="portl" name="PORTL" module-key="gpio_port">
-            <register-group-instance key="portl" name="PORTL" description="I/O Port" register-group-key="portl" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portl" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pl0" index="0" function="default" group="P"/>
                 <signal pad-id="pl1" index="1" function="default" group="P"/>
@@ -391,7 +391,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd7" function="default" group="T"/>
                 <signal pad-id="pg5" function="default" group="OCB"/>
@@ -399,7 +399,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg4" index="1" function="default" group="TOSC"/>
                 <signal pad-id="pg3" index="2" function="default" group="TOSC"/>
@@ -408,13 +408,13 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc5" name="TC5" module-key="tc16">
-            <register-group-instance key="tc5" name="TC5" description="Timer/Counter, 16-bit" register-group-key="tc5" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc5" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pl5" function="default" group="OCC"/>
                 <signal pad-id="pl4" function="default" group="OCB"/>
@@ -424,7 +424,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc4" name="TC4" module-key="tc16">
-            <register-group-instance key="tc4" name="TC4" description="Timer/Counter, 16-bit" register-group-key="tc4" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc4" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="ph7" function="default" group="T"/>
                 <signal pad-id="ph5" function="default" group="OCC"/>
@@ -434,7 +434,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
-            <register-group-instance key="tc3" name="TC3" description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe6" function="default" group="T"/>
                 <signal pad-id="pe7" function="default" group="ICP"/>
@@ -444,7 +444,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd6" function="default" group="T"/>
                 <signal pad-id="pd4" function="default" group="ICP"/>
@@ -454,7 +454,7 @@
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf4" function="default" group="TCK"/>
                 <signal pad-id="pf5" function="default" group="TMS"/>
@@ -463,7 +463,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="PCINT"/>
                 <signal pad-id="pb1" index="1" function="default" group="PCINT"/>
@@ -500,13 +500,13 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe7" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pf1" index="1" function="default" group="ADC"/>
@@ -527,13 +527,13 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1281.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1281.xml
index 87f34138..d454e201 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1281.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1281.xml
@@ -193,14 +193,14 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe1" function="default" group="TXD"/>
                 <signal pad-id="pe0" function="default" group="RXD"/>
@@ -208,7 +208,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" function="default" group="TXD"/>
                 <signal pad-id="pd2" function="default" group="RXD"/>
@@ -216,14 +216,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="SDA"/>
                 <signal pad-id="pd0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="SS"/>
                 <signal pad-id="pb2" function="default" group="MOSI"/>
@@ -232,7 +232,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -245,7 +245,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -258,7 +258,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -271,7 +271,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -284,7 +284,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="P"/>
                 <signal pad-id="pe1" index="1" function="default" group="P"/>
@@ -297,7 +297,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="P"/>
                 <signal pad-id="pf1" index="1" function="default" group="P"/>
@@ -310,7 +310,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="default" group="P"/>
                 <signal pad-id="pg1" index="1" function="default" group="P"/>
@@ -323,7 +323,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd7" function="default" group="T"/>
                 <signal pad-id="pg5" function="default" group="OCB"/>
@@ -331,7 +331,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg4" index="1" function="default" group="TOSC"/>
                 <signal pad-id="pg3" index="2" function="default" group="TOSC"/>
@@ -339,16 +339,16 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc5" name="TC5" module-key="tc16">
-            <register-group-instance key="tc5" name="TC5" description="Timer/Counter, 16-bit" register-group-key="tc5" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc5" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc4" name="TC4" module-key="tc16">
-            <register-group-instance key="tc4" name="TC4" description="Timer/Counter, 16-bit" register-group-key="tc4" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc4" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
-            <register-group-instance key="tc3" name="TC3" description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe6" function="default" group="T"/>
                 <signal pad-id="pe7" function="default" group="ICP"/>
@@ -358,7 +358,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd6" function="default" group="T"/>
                 <signal pad-id="pd4" function="default" group="ICP"/>
@@ -368,10 +368,10 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf4" function="default" group="TCK"/>
                 <signal pad-id="pf5" function="default" group="TMS"/>
@@ -380,7 +380,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="PCINT"/>
                 <signal pad-id="pb1" index="1" function="default" group="PCINT"/>
@@ -402,7 +402,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pf1" index="1" function="default" group="ADC"/>
@@ -415,19 +415,19 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe7" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284.xml
index e2141fb1..076fe420 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284.xml
@@ -218,14 +218,14 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pb3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="TXD"/>
                 <signal pad-id="pd0" function="default" group="RXD"/>
@@ -233,7 +233,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" function="default" group="TXD"/>
                 <signal pad-id="pd2" function="default" group="RXD"/>
@@ -241,7 +241,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -254,7 +254,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -267,7 +267,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -280,7 +280,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -293,7 +293,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="T"/>
                 <signal pad-id="pb4" function="default" group="OCB"/>
@@ -301,7 +301,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" function="default" group="T"/>
                 <signal pad-id="pd6" function="default" group="ICP"/>
@@ -310,7 +310,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
-            <register-group-instance key="tc3" name="TC3" description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" function="default" group="T"/>
                 <signal pad-id="pb5" function="default" group="ICP"/>
@@ -319,17 +319,17 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd7" function="default" group="OCA"/>
                 <signal pad-id="pd6" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="PCINT"/>
                 <signal pad-id="pa1" index="1" function="default" group="PCINT"/>
@@ -369,7 +369,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="default" group="ADC"/>
@@ -382,7 +382,7 @@
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc2" function="default" group="TCK"/>
                 <signal pad-id="pc3" function="default" group="TMS"/>
@@ -391,17 +391,17 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc1" function="default" group="SDA"/>
                 <signal pad-id="pc0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb4" function="default" group="SS"/>
                 <signal pad-id="pb5" function="default" group="MOSI"/>
@@ -410,19 +410,19 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284P.xml
index 929b48f3..b1056531 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284P.xml
@@ -218,14 +218,14 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pb3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="TXD"/>
                 <signal pad-id="pd0" function="default" group="RXD"/>
@@ -233,7 +233,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" function="default" group="TXD"/>
                 <signal pad-id="pd2" function="default" group="RXD"/>
@@ -241,7 +241,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -254,7 +254,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -267,7 +267,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -280,7 +280,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -293,7 +293,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="T"/>
                 <signal pad-id="pb4" function="default" group="OCB"/>
@@ -301,7 +301,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" function="default" group="T"/>
                 <signal pad-id="pd6" function="default" group="ICP"/>
@@ -310,7 +310,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
-            <register-group-instance key="tc3" name="TC3" description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" function="default" group="T"/>
                 <signal pad-id="pb5" function="default" group="ICP"/>
@@ -319,17 +319,17 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd7" function="default" group="OCA"/>
                 <signal pad-id="pd6" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="PCINT"/>
                 <signal pad-id="pa1" index="1" function="default" group="PCINT"/>
@@ -369,7 +369,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="default" group="ADC"/>
@@ -382,7 +382,7 @@
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc2" function="default" group="TCK"/>
                 <signal pad-id="pc3" function="default" group="TMS"/>
@@ -391,17 +391,17 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc1" function="default" group="SDA"/>
                 <signal pad-id="pc0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb4" function="default" group="SS"/>
                 <signal pad-id="pb5" function="default" group="MOSI"/>
@@ -410,19 +410,19 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284RFR2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284RFR2.xml
index f538df26..b766ccba 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284RFR2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284RFR2.xml
@@ -195,28 +195,28 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0_spi" name="USART0_SPI" module-key="spi">
-            <register-group-instance key="usart0_spi" name="USART0_SPI" description="Serial Peripheral Interface" register-group-key="usart0_spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="usart0_spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart1_spi" name="USART1_SPI" module-key="spi">
-            <register-group-instance key="usart1_spi" name="USART1_SPI" description="Serial Peripheral Interface" register-group-key="usart1_spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="usart1_spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -229,7 +229,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -242,7 +242,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -254,7 +254,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -267,7 +267,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
                 <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
@@ -275,61 +275,61 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc5" name="TC5" module-key="tc16">
-            <register-group-instance key="tc5" name="TC5" description="Timer/Counter, 16-bit" register-group-key="tc5" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc5" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc4" name="TC4" module-key="tc16">
-            <register-group-instance key="tc4" name="TC4" description="Timer/Counter, 16-bit" register-group-key="tc4" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc4" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
-            <register-group-instance key="tc3" name="TC3" description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="trx24" name="TRX24" module-key="trx24">
-            <register-group-instance key="trx24" name="TRX24" description="Low-Power 2.4 GHz Transceiver" register-group-key="trx24" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Low-Power 2.4 GHz Transceiver" register-group-key="trx24" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="symcnt" name="SYMCNT" module-key="symcnt">
-            <register-group-instance key="symcnt" name="SYMCNT" description="MAC Symbol Counter" register-group-key="symcnt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="MAC Symbol Counter" register-group-key="symcnt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="flash" name="FLASH" module-key="flash">
-            <register-group-instance key="flash" name="FLASH" description="FLASH Controller" register-group-key="flash" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="FLASH Controller" register-group-key="flash" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="pwrctrl" name="PWRCTRL" module-key="pwrctrl">
-            <register-group-instance key="pwrctrl" name="PWRCTRL" description="Power Controller" register-group-key="pwrctrl" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Power Controller" register-group-key="pwrctrl" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128A.xml
index a58932bd..b9ffbd47 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128A.xml
@@ -193,14 +193,14 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb3" function="default" group="MISO"/>
                 <signal pad-id="pb2" function="default" group="MOSI"/>
@@ -209,14 +209,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="SDA"/>
                 <signal pad-id="pd0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" function="default" group="RXD"/>
                 <signal pad-id="pe1" function="default" group="TXD"/>
@@ -224,7 +224,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd2" function="default" group="RXD"/>
                 <signal pad-id="pd3" function="default" group="TXD"/>
@@ -232,13 +232,13 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf4" function="default" group="TCK"/>
                 <signal pad-id="pf5" function="default" group="TMS"/>
@@ -247,7 +247,7 @@
             </signals>
         </peripheral>
         <peripheral key="misc" name="MISC" module-key="misc">
-            <register-group-instance key="misc" name="MISC" description="Other Registers" register-group-key="misc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Other Registers" register-group-key="misc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" function="default" group="PDI"/>
                 <signal pad-id="pe1" function="default" group="PDO"/>
@@ -276,7 +276,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="INT"/>
                 <signal pad-id="pd1" index="1" function="default" group="INT"/>
@@ -289,10 +289,10 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -305,7 +305,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -318,7 +318,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -331,7 +331,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -344,7 +344,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="P"/>
                 <signal pad-id="pe1" index="1" function="default" group="P"/>
@@ -357,7 +357,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="P"/>
                 <signal pad-id="pf1" index="1" function="default" group="P"/>
@@ -370,7 +370,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="default" group="P"/>
                 <signal pad-id="pg1" index="1" function="default" group="P"/>
@@ -380,13 +380,13 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8_async">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit Async" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb4" function="default" group="OC"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb5" function="default" group="OCA"/>
                 <signal pad-id="pb6" function="default" group="OCB"/>
@@ -396,7 +396,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
-            <register-group-instance key="tc" name="TC" description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe3" function="default" group="OCA"/>
                 <signal pad-id="pe4" function="default" group="OCB"/>
@@ -405,17 +405,17 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8">
-            <register-group-instance key="tc" name="TC" description="Timer/Counter, 8-bit" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd7" function="default" group="T"/>
                 <signal pad-id="pb7" function="default" group="OC"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pf1" index="1" function="default" group="ADC"/>
@@ -428,10 +428,10 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFA1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFA1.xml
index 8e2fce71..9aff4780 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFA1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFA1.xml
@@ -192,28 +192,28 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0_spi" name="USART0_SPI" module-key="spi">
-            <register-group-instance key="usart0_spi" name="USART0_SPI" description="Serial Peripheral Interface" register-group-key="usart0_spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="usart0_spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart1_spi" name="USART1_SPI" module-key="spi">
-            <register-group-instance key="usart1_spi" name="USART1_SPI" description="Serial Peripheral Interface" register-group-key="usart1_spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="usart1_spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -226,7 +226,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -239,7 +239,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -252,7 +252,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -265,7 +265,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="PORTG" group="P"/>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
@@ -276,61 +276,61 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc5" name="TC5" module-key="tc16">
-            <register-group-instance key="tc5" name="TC5" description="Timer/Counter, 16-bit" register-group-key="tc5" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc5" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc4" name="TC4" module-key="tc16">
-            <register-group-instance key="tc4" name="TC4" description="Timer/Counter, 16-bit" register-group-key="tc4" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc4" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
-            <register-group-instance key="tc3" name="TC3" description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="trx24" name="TRX24" module-key="trx24">
-            <register-group-instance key="trx24" name="TRX24" description="Low-Power 2.4 GHz Transceiver" register-group-key="trx24" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Low-Power 2.4 GHz Transceiver" register-group-key="trx24" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="symcnt" name="SYMCNT" module-key="symcnt">
-            <register-group-instance key="symcnt" name="SYMCNT" description="MAC Symbol Counter" register-group-key="symcnt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="MAC Symbol Counter" register-group-key="symcnt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="flash" name="FLASH" module-key="flash">
-            <register-group-instance key="flash" name="FLASH" description="FLASH Controller" register-group-key="flash" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="FLASH Controller" register-group-key="flash" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="pwrctrl" name="PWRCTRL" module-key="pwrctrl">
-            <register-group-instance key="pwrctrl" name="PWRCTRL" description="Power Controller" register-group-key="pwrctrl" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Power Controller" register-group-key="pwrctrl" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFR2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFR2.xml
index 82711c1f..3e0629d5 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFR2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFR2.xml
@@ -195,28 +195,28 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0_spi" name="USART0_SPI" module-key="spi">
-            <register-group-instance key="usart0_spi" name="USART0_SPI" description="Serial Peripheral Interface" register-group-key="usart0_spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="usart0_spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart1_spi" name="USART1_SPI" module-key="spi">
-            <register-group-instance key="usart1_spi" name="USART1_SPI" description="Serial Peripheral Interface" register-group-key="usart1_spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="usart1_spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -229,7 +229,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -242,7 +242,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -255,7 +255,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -268,7 +268,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="PORTG" group="P"/>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
@@ -279,61 +279,61 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc5" name="TC5" module-key="tc16">
-            <register-group-instance key="tc5" name="TC5" description="Timer/Counter, 16-bit" register-group-key="tc5" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc5" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc4" name="TC4" module-key="tc16">
-            <register-group-instance key="tc4" name="TC4" description="Timer/Counter, 16-bit" register-group-key="tc4" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc4" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
-            <register-group-instance key="tc3" name="TC3" description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="trx24" name="TRX24" module-key="trx24">
-            <register-group-instance key="trx24" name="TRX24" description="Low-Power 2.4 GHz Transceiver" register-group-key="trx24" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Low-Power 2.4 GHz Transceiver" register-group-key="trx24" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="symcnt" name="SYMCNT" module-key="symcnt">
-            <register-group-instance key="symcnt" name="SYMCNT" description="MAC Symbol Counter" register-group-key="symcnt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="MAC Symbol Counter" register-group-key="symcnt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="flash" name="FLASH" module-key="flash">
-            <register-group-instance key="flash" name="FLASH" description="FLASH Controller" register-group-key="flash" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="FLASH Controller" register-group-key="flash" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="pwrctrl" name="PWRCTRL" module-key="pwrctrl">
-            <register-group-instance key="pwrctrl" name="PWRCTRL" description="Power Controller" register-group-key="pwrctrl" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Power Controller" register-group-key="pwrctrl" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16.xml
index dd8dd718..8051e4ab 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16.xml
@@ -218,14 +218,14 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb3" function="default" group="OC"/>
                 <signal pad-id="pb0" function="default" group="T"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" function="default" group="T"/>
                 <signal pad-id="pd6" function="default" group="ICP"/>
@@ -234,7 +234,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" index="2" function="default" group="INT"/>
                 <signal pad-id="pd3" index="1" function="default" group="INT"/>
@@ -242,13 +242,13 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc7" index="2" function="default" group="TOSC"/>
                 <signal pad-id="pc6" index="1" function="default" group="TOSC"/>
@@ -256,7 +256,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb7" function="default" group="SCK"/>
                 <signal pad-id="pb6" function="default" group="MISO"/>
@@ -265,7 +265,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart" name="USART" module-key="usart">
-            <register-group-instance key="usart" name="USART" description="USART" register-group-key="usart" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="XCK"/>
                 <signal pad-id="pd1" function="default" group="TXD"/>
@@ -273,21 +273,21 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc1" function="default" group="SDA"/>
                 <signal pad-id="pc0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb3" index="1" function="default" group="AIN"/>
                 <signal pad-id="pb2" index="0" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa7" index="7" function="default" group="ADC"/>
                 <signal pad-id="pa6" index="6" function="default" group="ADC"/>
@@ -300,7 +300,7 @@
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc5" function="default" group="TDI"/>
                 <signal pad-id="pc4" function="default" group="TDO"/>
@@ -309,10 +309,10 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -325,7 +325,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -338,7 +338,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -351,7 +351,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -364,13 +364,13 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1608.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1608.xml
index 1426cf04..13ea9583 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1608.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1608.xml
@@ -43,7 +43,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd5" index="1" function="AC0" group="N"/>
@@ -56,7 +56,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
@@ -73,10 +73,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="i2128">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
@@ -100,7 +100,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2113">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa0" function="CLKCTRL" group="CLKI"/>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKO"/>
@@ -109,16 +109,16 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="i2122">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2118">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT0"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT0"/>
@@ -129,19 +129,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2600_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="i2600_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i2600_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="i2109">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -154,7 +154,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -163,7 +163,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
@@ -176,7 +176,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -188,25 +188,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2600_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="i2600_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="i2112">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="i2107">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc1" function="SPI_ALT" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
                 <signal pad-id="pa5" function="SPI" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
@@ -219,10 +219,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2600_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pd0" index="0" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -249,27 +249,27 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA80"/>
             <signals>
                 <signal pad-id="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="i2119">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xA90"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA90"/>
             <signals>
                 <signal pad-id="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="i2119">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xAA0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pf3" function="I2C_ALT2" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
                 <signal pad-id="pc3" function="I2C_ALT" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
@@ -280,7 +280,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -293,7 +293,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="i2108">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -302,7 +302,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="i2108">
-            <register-group-instance key="usart2" name="USART2" register-group-key="usart" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
                 <signal pad-id="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
@@ -314,31 +314,31 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="i2103_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="i2103_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="i2103_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="i2103_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vporte" name="VPORTE" module-key="i2103_vport">
-            <register-group-instance key="vporte" name="VPORTE" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="i2103_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="i2600_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i2127">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1609.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1609.xml
index 1fb969d8..9223a251 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1609.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1609.xml
@@ -43,7 +43,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd5" index="1" function="AC0" group="N"/>
@@ -56,7 +56,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
@@ -77,10 +77,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="i2128">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
@@ -105,7 +105,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2113">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa0" function="CLKCTRL" group="CLKI"/>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKO"/>
@@ -114,16 +114,16 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="i2122">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2118">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT0"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT0"/>
@@ -137,19 +137,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2600_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="i2600_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i2600_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="i2109">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -162,7 +162,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -173,7 +173,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -186,7 +186,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
@@ -199,7 +199,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pe1" index="1" function="IOPORT" group="PIN"/>
@@ -208,7 +208,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -220,25 +220,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2600_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="i2600_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="i2112">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="i2107">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pe1" function="SPI_ALT2" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
                 <signal pad-id="pc1" function="SPI_ALT" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
@@ -255,10 +255,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2600_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pe0" index="0" function="TCA_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -297,35 +297,35 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA80"/>
             <signals>
                 <signal pad-id="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="i2119">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xA90"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA90"/>
             <signals>
                 <signal pad-id="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="i2119">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xAA0"/>
             <signals>
                 <signal pad-id="pb4" index="0" function="TCB2_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcb3" name="TCB3" module-key="i2119">
-            <register-group-instance key="tcb3" name="TCB3" register-group-key="tcb" address-space-key="data" offset="0xAB0"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xAB0"/>
             <signals>
                 <signal pad-id="pc1" index="0" function="TCB3_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
                 <signal pad-id="pb5" index="0" function="TCB3" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pf3" function="I2C_ALT2" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
                 <signal pad-id="pc3" function="I2C_ALT" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
@@ -336,7 +336,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -349,7 +349,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="i2108">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc5" function="USART1_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -362,7 +362,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="i2108">
-            <register-group-instance key="usart2" name="USART2" register-group-key="usart" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
                 <signal pad-id="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
@@ -374,7 +374,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="i2108">
-            <register-group-instance key="usart3" name="USART3" register-group-key="usart" address-space-key="data" offset="0x860"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x860"/>
             <signals>
                 <signal pad-id="pb5" function="USART3_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
                 <signal pad-id="pb1" function="USART3" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
@@ -385,31 +385,31 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="i2103_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="i2103_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="i2103_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="i2103_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vporte" name="VPORTE" module-key="i2103_vport">
-            <register-group-instance key="vporte" name="VPORTE" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="i2103_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="i2600_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i2127">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA162.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA162.xml
index aa31b7a8..4b22f723 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA162.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA162.xml
@@ -219,40 +219,40 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
-            <register-group-instance key="tc3" name="TC3" description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -265,7 +265,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -278,7 +278,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -291,7 +291,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -304,7 +304,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -312,19 +312,19 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164A.xml
index 2a89830e..d47b8804 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164A.xml
@@ -218,14 +218,14 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pb3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="TXD"/>
                 <signal pad-id="pd0" function="default" group="RXD"/>
@@ -233,7 +233,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" function="default" group="TXD"/>
                 <signal pad-id="pd2" function="default" group="RXD"/>
@@ -241,7 +241,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -254,7 +254,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -267,7 +267,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -280,7 +280,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -293,7 +293,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="T"/>
                 <signal pad-id="pb4" function="default" group="OCB"/>
@@ -301,7 +301,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc6" index="1" function="default" group="TOSC"/>
                 <signal pad-id="pc7" index="2" function="default" group="TOSC"/>
@@ -310,10 +310,10 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc2" function="default" group="TCK"/>
                 <signal pad-id="pc3" function="default" group="TMS"/>
@@ -322,10 +322,10 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="PCINT"/>
                 <signal pad-id="pa1" index="1" function="default" group="PCINT"/>
@@ -365,7 +365,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="default" group="ADC"/>
@@ -378,7 +378,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" function="default" group="T"/>
                 <signal pad-id="pd6" function="default" group="ICP"/>
@@ -387,10 +387,10 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb4" function="default" group="SS"/>
                 <signal pad-id="pb5" function="default" group="MOSI"/>
@@ -399,23 +399,23 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc1" function="default" group="SDA"/>
                 <signal pad-id="pc0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164P.xml
index 104ff8ab..854799e3 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164P.xml
@@ -218,14 +218,14 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pb3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="TXD"/>
                 <signal pad-id="pd0" function="default" group="RXD"/>
@@ -233,7 +233,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" function="default" group="TXD"/>
                 <signal pad-id="pd2" function="default" group="RXD"/>
@@ -241,7 +241,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -254,7 +254,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -267,7 +267,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -280,7 +280,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -293,7 +293,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="T"/>
                 <signal pad-id="pb4" function="default" group="OCB"/>
@@ -301,17 +301,17 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd7" function="default" group="OCA"/>
                 <signal pad-id="pd6" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc2" function="default" group="TCK"/>
                 <signal pad-id="pc3" function="default" group="TMS"/>
@@ -320,10 +320,10 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="PCINT"/>
                 <signal pad-id="pa1" index="1" function="default" group="PCINT"/>
@@ -363,7 +363,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="default" group="ADC"/>
@@ -376,7 +376,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" function="default" group="T"/>
                 <signal pad-id="pd6" function="default" group="ICP"/>
@@ -385,10 +385,10 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb4" function="default" group="SS"/>
                 <signal pad-id="pb5" function="default" group="MOSI"/>
@@ -397,23 +397,23 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc1" function="default" group="SDA"/>
                 <signal pad-id="pc0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164PA.xml
index 8298ea5e..fa39e8eb 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164PA.xml
@@ -218,14 +218,14 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pb3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="TXD"/>
                 <signal pad-id="pd0" function="default" group="RXD"/>
@@ -233,7 +233,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" function="default" group="TXD"/>
                 <signal pad-id="pd2" function="default" group="RXD"/>
@@ -241,7 +241,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -254,7 +254,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -267,7 +267,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -280,7 +280,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -293,7 +293,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="T"/>
                 <signal pad-id="pb4" function="default" group="OCB"/>
@@ -301,7 +301,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc6" index="1" function="default" group="TOSC"/>
                 <signal pad-id="pc7" index="2" function="default" group="TOSC"/>
@@ -310,10 +310,10 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc2" function="default" group="TCK"/>
                 <signal pad-id="pc3" function="default" group="TMS"/>
@@ -322,10 +322,10 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="PCINT"/>
                 <signal pad-id="pa1" index="1" function="default" group="PCINT"/>
@@ -365,7 +365,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="default" group="ADC"/>
@@ -378,7 +378,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" function="default" group="T"/>
                 <signal pad-id="pd6" function="default" group="ICP"/>
@@ -387,10 +387,10 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb4" function="default" group="SS"/>
                 <signal pad-id="pb5" function="default" group="MOSI"/>
@@ -399,23 +399,23 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc1" function="default" group="SDA"/>
                 <signal pad-id="pc0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165A.xml
index ad34dc89..47932594 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165A.xml
@@ -192,25 +192,25 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -223,7 +223,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -236,7 +236,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -249,7 +249,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -262,7 +262,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -275,7 +275,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -288,7 +288,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="PORTG" group="P"/>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
@@ -299,34 +299,34 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165P.xml
index 8e30d1b8..197d346f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165P.xml
@@ -192,25 +192,25 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -223,7 +223,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -236,7 +236,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -249,7 +249,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -262,7 +262,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -275,7 +275,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -288,7 +288,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="PORTG" group="P"/>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
@@ -299,34 +299,34 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165PA.xml
index 5f64c71a..b2007265 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165PA.xml
@@ -192,25 +192,25 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -223,7 +223,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -236,7 +236,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -249,7 +249,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -262,7 +262,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -275,7 +275,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -288,7 +288,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="PORTG" group="P"/>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
@@ -299,34 +299,34 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168.xml
index 761e41ae..f60c2a7b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168.xml
@@ -218,7 +218,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="TXD"/>
                 <signal pad-id="pd0" function="default" group="RXD"/>
@@ -226,14 +226,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc4" function="default" group="SDA"/>
                 <signal pad-id="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd5" function="default" group="T"/>
                 <signal pad-id="pb0" function="default" group="ICP"/>
@@ -242,14 +242,14 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb3" function="default" group="OCA"/>
                 <signal pad-id="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pc1" index="1" function="default" group="ADC"/>
@@ -260,14 +260,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="default" group="AIN"/>
                 <signal pad-id="pd7" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -280,7 +280,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -292,7 +292,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -305,7 +305,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd4" function="default" group="T"/>
                 <signal pad-id="pd5" function="default" group="OCB"/>
@@ -313,7 +313,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" index="1" function="default" group="INT"/>
                 <signal pad-id="pd3" index="19" function="default" group="PCINT"/>
@@ -343,7 +343,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" function="default" group="SS"/>
                 <signal pad-id="pb3" function="default" group="MOSI"/>
@@ -352,22 +352,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168A.xml
index b67ee2a1..14f12117 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168A.xml
@@ -218,7 +218,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="TXD"/>
                 <signal pad-id="pd0" function="default" group="RXD"/>
@@ -226,14 +226,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc4" function="default" group="SDA"/>
                 <signal pad-id="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd5" function="default" group="T"/>
                 <signal pad-id="pb0" function="default" group="ICP"/>
@@ -242,14 +242,14 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb3" function="default" group="OCA"/>
                 <signal pad-id="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pc1" index="1" function="default" group="ADC"/>
@@ -260,14 +260,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="default" group="AIN"/>
                 <signal pad-id="pd7" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -280,7 +280,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -292,7 +292,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -305,7 +305,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd4" function="default" group="T"/>
                 <signal pad-id="pd5" function="default" group="OCB"/>
@@ -313,7 +313,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" index="1" function="default" group="INT"/>
                 <signal pad-id="pd3" index="19" function="default" group="PCINT"/>
@@ -343,7 +343,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" function="default" group="SS"/>
                 <signal pad-id="pb3" function="default" group="MOSI"/>
@@ -352,22 +352,22 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168P.xml
index 05820e83..535c36df 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168P.xml
@@ -218,7 +218,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="TXD"/>
                 <signal pad-id="pd0" function="default" group="RXD"/>
@@ -226,14 +226,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc4" function="default" group="SDA"/>
                 <signal pad-id="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd5" function="default" group="T"/>
                 <signal pad-id="pb0" function="default" group="ICP"/>
@@ -242,14 +242,14 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb3" function="default" group="OCA"/>
                 <signal pad-id="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pc1" index="1" function="default" group="ADC"/>
@@ -260,14 +260,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="default" group="AIN"/>
                 <signal pad-id="pd7" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -280,7 +280,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -292,7 +292,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -305,7 +305,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd4" function="default" group="T"/>
                 <signal pad-id="pd5" function="default" group="OCB"/>
@@ -313,7 +313,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" index="1" function="default" group="INT"/>
                 <signal pad-id="pd3" index="19" function="default" group="PCINT"/>
@@ -343,7 +343,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" function="default" group="SS"/>
                 <signal pad-id="pb3" function="default" group="MOSI"/>
@@ -352,22 +352,22 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PA.xml
index 022f39e4..61b94c09 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PA.xml
@@ -218,7 +218,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="TXD"/>
                 <signal pad-id="pd0" function="default" group="RXD"/>
@@ -226,14 +226,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc4" function="default" group="SDA"/>
                 <signal pad-id="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd5" function="default" group="T"/>
                 <signal pad-id="pb0" function="default" group="ICP"/>
@@ -242,14 +242,14 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb3" function="default" group="OCA"/>
                 <signal pad-id="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pc1" index="1" function="default" group="ADC"/>
@@ -260,14 +260,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="default" group="AIN"/>
                 <signal pad-id="pd7" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -280,7 +280,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -292,7 +292,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -305,7 +305,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd4" function="default" group="T"/>
                 <signal pad-id="pd5" function="default" group="OCB"/>
@@ -313,7 +313,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" index="1" function="default" group="INT"/>
                 <signal pad-id="pd3" index="19" function="default" group="PCINT"/>
@@ -343,7 +343,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" function="default" group="SS"/>
                 <signal pad-id="pb3" function="default" group="MOSI"/>
@@ -352,22 +352,22 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PB.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PB.xml
index c0d268d9..a279112b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PB.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PB.xml
@@ -218,7 +218,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="TXD"/>
                 <signal pad-id="pd0" function="default" group="RXD"/>
@@ -226,14 +226,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc4" function="default" group="SDA"/>
                 <signal pad-id="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd5" function="default" group="T"/>
                 <signal pad-id="pb0" function="default" group="ICP"/>
@@ -242,14 +242,14 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb3" function="default" group="OCA"/>
                 <signal pad-id="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pc1" index="1" function="default" group="ADC"/>
@@ -262,7 +262,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" function="default" group="AC"/>
                 <signal pad-id="pd6" index="0" function="default" group="AIN"/>
@@ -270,7 +270,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -283,7 +283,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -295,7 +295,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -308,7 +308,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="P"/>
                 <signal pad-id="pe1" index="1" function="default" group="P"/>
@@ -317,7 +317,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd4" function="default" group="T"/>
                 <signal pad-id="pd5" function="default" group="OCB"/>
@@ -325,7 +325,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" index="1" function="default" group="INT"/>
                 <signal pad-id="pd3" index="19" function="default" group="PCINT"/>
@@ -355,7 +355,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" function="default" group="SS"/>
                 <signal pad-id="pb3" function="default" group="MOSI"/>
@@ -364,25 +364,25 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="deviceid" name="DEVICEID" module-key="deviceid">
-            <register-group-instance key="deviceid" name="DEVICEID" description="Device ID" register-group-key="deviceid" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Device ID" register-group-key="deviceid" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169A.xml
index f3ec385a..0f890ef3 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169A.xml
@@ -192,14 +192,14 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg4" function="default" group="T"/>
                 <signal pad-id="pb4" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg3" function="default" group="T"/>
                 <signal pad-id="pd0" function="default" group="ICP"/>
@@ -209,20 +209,20 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb7" function="default" group="OCA"/>
                 <signal pad-id="xtal2" function="default" group="TOSC"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="SS"/>
                 <signal pad-id="pb1" function="default" group="SCK"/>
@@ -231,7 +231,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -244,7 +244,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -257,7 +257,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -270,7 +270,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -283,7 +283,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="P"/>
                 <signal pad-id="pe1" index="1" function="default" group="P"/>
@@ -296,7 +296,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="P"/>
                 <signal pad-id="pf1" index="1" function="default" group="P"/>
@@ -309,7 +309,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="default" group="P"/>
                 <signal pad-id="pg1" index="1" function="default" group="P"/>
@@ -320,14 +320,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf4" function="default" group="TCK"/>
                 <signal pad-id="pf5" function="default" group="TMS"/>
@@ -336,7 +336,7 @@
             </signals>
         </peripheral>
         <peripheral key="lcd" name="LCD" module-key="lcd">
-            <register-group-instance key="lcd" name="LCD" description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa4" index="0" function="default" group="SEG"/>
                 <signal pad-id="pa5" index="1" function="default" group="SEG"/>
@@ -370,7 +370,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="PCINT"/>
                 <signal pad-id="pe1" index="1" function="default" group="PCINT"/>
@@ -392,20 +392,20 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe7" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe5" function="default" group="DI"/>
                 <signal pad-id="pe6" function="default" group="DO"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pf1" index="1" function="default" group="ADC"/>
@@ -418,10 +418,10 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" function="default" group="RXD"/>
                 <signal pad-id="pe1" function="default" group="TXD"/>
@@ -430,10 +430,10 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169P.xml
index 82f32b83..2419e3c4 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169P.xml
@@ -192,14 +192,14 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg4" function="default" group="T"/>
                 <signal pad-id="pb4" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg3" function="default" group="T"/>
                 <signal pad-id="pd0" function="default" group="ICP"/>
@@ -209,20 +209,20 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb7" function="default" group="OCA"/>
                 <signal pad-id="xtal2" function="default" group="TOSC"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="SS"/>
                 <signal pad-id="pb1" function="default" group="SCK"/>
@@ -231,7 +231,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -244,7 +244,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -257,7 +257,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -270,7 +270,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -283,7 +283,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="P"/>
                 <signal pad-id="pe1" index="1" function="default" group="P"/>
@@ -296,7 +296,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="P"/>
                 <signal pad-id="pf1" index="1" function="default" group="P"/>
@@ -309,7 +309,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="default" group="P"/>
                 <signal pad-id="pg1" index="1" function="default" group="P"/>
@@ -320,14 +320,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf4" function="default" group="TCK"/>
                 <signal pad-id="pf5" function="default" group="TMS"/>
@@ -336,7 +336,7 @@
             </signals>
         </peripheral>
         <peripheral key="lcd" name="LCD" module-key="lcd">
-            <register-group-instance key="lcd" name="LCD" description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa4" index="0" function="default" group="SEG"/>
                 <signal pad-id="pa5" index="1" function="default" group="SEG"/>
@@ -370,7 +370,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="PCINT"/>
                 <signal pad-id="pe1" index="1" function="default" group="PCINT"/>
@@ -392,20 +392,20 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe7" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe5" function="default" group="DI"/>
                 <signal pad-id="pe6" function="default" group="DO"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pf1" index="1" function="default" group="ADC"/>
@@ -418,10 +418,10 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" function="default" group="RXD"/>
                 <signal pad-id="pe1" function="default" group="TXD"/>
@@ -430,10 +430,10 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169PA.xml
index 1cae6d75..3499ce5a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169PA.xml
@@ -192,14 +192,14 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg4" function="default" group="T"/>
                 <signal pad-id="pb4" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg3" function="default" group="T"/>
                 <signal pad-id="pd0" function="default" group="ICP"/>
@@ -209,20 +209,20 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb7" function="default" group="OCA"/>
                 <signal pad-id="xtal2" function="default" group="TOSC"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="SS"/>
                 <signal pad-id="pb1" function="default" group="SCK"/>
@@ -231,7 +231,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -244,7 +244,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -257,7 +257,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -270,7 +270,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -283,7 +283,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="P"/>
                 <signal pad-id="pe1" index="1" function="default" group="P"/>
@@ -296,7 +296,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="P"/>
                 <signal pad-id="pf1" index="1" function="default" group="P"/>
@@ -309,7 +309,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="default" group="P"/>
                 <signal pad-id="pg1" index="1" function="default" group="P"/>
@@ -320,14 +320,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf4" function="default" group="TCK"/>
                 <signal pad-id="pf5" function="default" group="TMS"/>
@@ -336,7 +336,7 @@
             </signals>
         </peripheral>
         <peripheral key="lcd" name="LCD" module-key="lcd">
-            <register-group-instance key="lcd" name="LCD" description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa4" index="0" function="default" group="SEG"/>
                 <signal pad-id="pa5" index="1" function="default" group="SEG"/>
@@ -370,7 +370,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="PCINT"/>
                 <signal pad-id="pe1" index="1" function="default" group="PCINT"/>
@@ -392,20 +392,20 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe7" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe5" function="default" group="DI"/>
                 <signal pad-id="pe6" function="default" group="DO"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pf1" index="1" function="default" group="ADC"/>
@@ -418,10 +418,10 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" function="default" group="RXD"/>
                 <signal pad-id="pe1" function="default" group="TXD"/>
@@ -430,10 +430,10 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16A.xml
index 32f4b44d..4301ea98 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16A.xml
@@ -218,14 +218,14 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb3" function="default" group="OC"/>
                 <signal pad-id="pb0" function="default" group="T"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" function="default" group="T"/>
                 <signal pad-id="pd6" function="default" group="ICP"/>
@@ -234,7 +234,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" index="2" function="default" group="INT"/>
                 <signal pad-id="pd3" index="1" function="default" group="INT"/>
@@ -242,13 +242,13 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc7" index="2" function="default" group="TOSC"/>
                 <signal pad-id="pc6" index="1" function="default" group="TOSC"/>
@@ -256,7 +256,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb7" function="default" group="SCK"/>
                 <signal pad-id="pb6" function="default" group="MISO"/>
@@ -265,7 +265,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart" name="USART" module-key="usart">
-            <register-group-instance key="usart" name="USART" description="USART" register-group-key="usart" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="XCK"/>
                 <signal pad-id="pd1" function="default" group="TXD"/>
@@ -273,21 +273,21 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc1" function="default" group="SDA"/>
                 <signal pad-id="pc0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pb3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="default" group="ADC"/>
@@ -300,7 +300,7 @@
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc5" function="default" group="TDI"/>
                 <signal pad-id="pc4" function="default" group="TDO"/>
@@ -309,10 +309,10 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -325,7 +325,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -338,7 +338,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -351,7 +351,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -364,13 +364,13 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16M1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16M1.xml
index 1c277504..75c0ae5d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16M1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16M1.xml
@@ -192,7 +192,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -205,7 +205,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -218,7 +218,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
@@ -231,7 +231,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pe1" index="1" function="IOPORT" group="PIN"/>
@@ -239,10 +239,10 @@
             </signals>
         </peripheral>
         <peripheral key="can" name="CAN" module-key="can">
-            <register-group-instance key="can" name="CAN" description="Controller Area Network" register-group-key="can" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Controller Area Network" register-group-key="can" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd7" index="0" function="AC" group="ACMP"/>
                 <signal pad-id="pc6" index="1" function="AC" group="ACMP"/>
@@ -255,16 +255,16 @@
             </signals>
         </peripheral>
         <peripheral key="dac" name="DAC" module-key="dac">
-            <register-group-instance key="dac" name="DAC" description="Digital-to-Analog Converter" register-group-key="dac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Digital-to-Analog Converter" register-group-key="dac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc7" function="DAC" group="D2A"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc2" function="TC0" group="T0"/>
                 <signal pad-id="pd3" function="TC0" group="OC0A"/>
@@ -272,7 +272,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc3" function="TC1" group="T1"/>
                 <signal pad-id="pd4" function="TC1" group="ICP1A"/>
@@ -282,7 +282,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe2" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pd4" index="1" function="ADC" group="ADC"/>
@@ -298,14 +298,14 @@
             </signals>
         </peripheral>
         <peripheral key="linuart" name="LINUART" module-key="linuart">
-            <register-group-instance key="linuart" name="LINUART" description="Local Interconnect Network" register-group-key="linuart" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Local Interconnect Network" register-group-key="linuart" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" function="LIN" group="TXLIN"/>
                 <signal pad-id="pd4" function="LIN" group="RXLIN"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="SPI" group="MISO"/>
                 <signal pad-id="pd2" function="SPI_ALT" group="MISO"/>
@@ -318,10 +318,10 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="EXINT" group="INT"/>
                 <signal pad-id="pb2" index="1" function="EXINT" group="INT"/>
@@ -357,10 +357,10 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="psc" name="PSC" module-key="psc">
-            <register-group-instance key="psc" name="PSC" description="Power Stage Controller" register-group-key="psc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Power Stage Controller" register-group-key="psc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd2" function="PSC" group="PSCIN2"/>
                 <signal pad-id="pb0" function="PSC" group="PSCOUT2A"/>
@@ -374,10 +374,10 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U2.xml
index 4f0f9dce..09830be0 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U2.xml
@@ -192,7 +192,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -205,7 +205,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -218,7 +218,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -231,7 +231,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb3" function="default" group="MISO"/>
                 <signal pad-id="pb2" function="default" group="MOSI"/>
@@ -240,13 +240,13 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb7" function="default" group="OCA"/>
                 <signal pad-id="pd0" function="default" group="OCB"/>
@@ -254,7 +254,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc7" function="default" group="ICP"/>
                 <signal pad-id="pc6" function="default" group="OCA"/>
@@ -264,16 +264,16 @@
             </signals>
         </peripheral>
         <peripheral key="pll" name="PLL" module-key="pll">
-            <register-group-instance key="pll" name="PLL" description="Phase Locked Loop" register-group-key="pll" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Phase Locked Loop" register-group-key="pll" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usb_device" name="USB_DEVICE" module-key="usb_device">
-            <register-group-instance key="usb_device" name="USB_DEVICE" description="USB Device Registers" register-group-key="usb_device" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USB Device Registers" register-group-key="usb_device" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="INT"/>
                 <signal pad-id="pd1" index="1" function="default" group="INT"/>
@@ -299,7 +299,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd2" function="default" group="RXD"/>
                 <signal pad-id="pd3" function="default" group="TXD"/>
@@ -309,10 +309,10 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" index="0" function="default" group="AIN"/>
                 <signal pad-id="pd2" index="1" function="default" group="AIN"/>
@@ -324,10 +324,10 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U4.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U4.xml
index 7db7ffea..67c0e22f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U4.xml
@@ -192,10 +192,10 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -208,14 +208,14 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc6" index="6" function="default" group="P"/>
                 <signal pad-id="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -228,14 +228,14 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe2" index="2" function="default" group="P"/>
                 <signal pad-id="pe6" index="6" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="P"/>
                 <signal pad-id="pf1" index="1" function="default" group="P"/>
@@ -245,7 +245,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="SS"/>
                 <signal pad-id="pb1" function="default" group="SCK"/>
@@ -256,7 +256,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" function="default" group="TXD"/>
                 <signal pad-id="pd2" function="default" group="RXD"/>
@@ -266,16 +266,16 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe2" function="default" group="HWB"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd7" function="default" group="T"/>
                 <signal pad-id="pd0" function="default" group="OCB"/>
@@ -283,7 +283,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd6" function="default" group="T"/>
                 <signal pad-id="pd4" function="default" group="ICP"/>
@@ -293,14 +293,14 @@
             </signals>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
-            <register-group-instance key="tc3" name="TC3" description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc7" function="default" group="ICP"/>
                 <signal pad-id="pc6" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc4" name="TC4" module-key="tc10">
-            <register-group-instance key="tc4" name="TC4" description="Timer/Counter, 10-bit" register-group-key="tc4" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 10-bit" register-group-key="tc4" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc6" function="default" group="_OCA"/>
                 <signal pad-id="pc7" function="default" group="OCA"/>
@@ -311,7 +311,7 @@
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf4" function="default" group="TCK"/>
                 <signal pad-id="pf5" function="default" group="TMS"/>
@@ -320,7 +320,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="PCINT"/>
                 <signal pad-id="pb1" index="1" function="default" group="PCINT"/>
@@ -338,14 +338,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="SDA"/>
                 <signal pad-id="pd0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pf1" index="1" function="default" group="ADC"/>
@@ -362,28 +362,28 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe6" index="0" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc7" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="pll" name="PLL" module-key="pll">
-            <register-group-instance key="pll" name="PLL" description="Phase Locked Loop" register-group-key="pll" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Phase Locked Loop" register-group-key="pll" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usb_device" name="USB_DEVICE" module-key="usb_device">
-            <register-group-instance key="usb_device" name="USB_DEVICE" description="USB Device Registers" register-group-key="usb_device" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USB Device Registers" register-group-key="usb_device" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2560.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2560.xml
index da3dc745..b577c413 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2560.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2560.xml
@@ -193,14 +193,14 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe1" function="default" group="TXD"/>
                 <signal pad-id="pe0" function="default" group="RXD"/>
@@ -208,7 +208,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" function="default" group="TXD"/>
                 <signal pad-id="pd2" function="default" group="RXD"/>
@@ -216,7 +216,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="usart">
-            <register-group-instance key="usart2" name="USART2" description="USART" register-group-key="usart2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="ph1" function="default" group="TXD"/>
                 <signal pad-id="ph0" function="default" group="RXD"/>
@@ -224,7 +224,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="usart">
-            <register-group-instance key="usart3" name="USART3" description="USART" register-group-key="usart3" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart3" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pj1" function="default" group="TXD"/>
                 <signal pad-id="pj0" function="default" group="RXD"/>
@@ -232,14 +232,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="SDA"/>
                 <signal pad-id="pd0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="SS"/>
                 <signal pad-id="pb2" function="default" group="MOSI"/>
@@ -248,7 +248,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -261,7 +261,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -274,7 +274,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -287,7 +287,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -300,7 +300,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="P"/>
                 <signal pad-id="pe1" index="1" function="default" group="P"/>
@@ -313,7 +313,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="P"/>
                 <signal pad-id="pf1" index="1" function="default" group="P"/>
@@ -326,7 +326,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="default" group="P"/>
                 <signal pad-id="pg1" index="1" function="default" group="P"/>
@@ -339,7 +339,7 @@
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
-            <register-group-instance key="porth" name="PORTH" description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="ph0" index="0" function="default" group="P"/>
                 <signal pad-id="ph1" index="1" function="default" group="P"/>
@@ -352,7 +352,7 @@
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
-            <register-group-instance key="portj" name="PORTJ" description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pj0" index="0" function="default" group="P"/>
                 <signal pad-id="pj1" index="1" function="default" group="P"/>
@@ -365,7 +365,7 @@
             </signals>
         </peripheral>
         <peripheral key="portk" name="PORTK" module-key="gpio_port">
-            <register-group-instance key="portk" name="PORTK" description="I/O Port" register-group-key="portk" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portk" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pk0" index="0" function="default" group="P"/>
                 <signal pad-id="pk1" index="1" function="default" group="P"/>
@@ -378,7 +378,7 @@
             </signals>
         </peripheral>
         <peripheral key="portl" name="PORTL" module-key="gpio_port">
-            <register-group-instance key="portl" name="PORTL" description="I/O Port" register-group-key="portl" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portl" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pl0" index="0" function="default" group="P"/>
                 <signal pad-id="pl1" index="1" function="default" group="P"/>
@@ -391,7 +391,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd7" function="default" group="T"/>
                 <signal pad-id="pg5" function="default" group="OCB"/>
@@ -399,7 +399,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg4" index="1" function="default" group="TOSC"/>
                 <signal pad-id="pg3" index="2" function="default" group="TOSC"/>
@@ -408,13 +408,13 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc5" name="TC5" module-key="tc16">
-            <register-group-instance key="tc5" name="TC5" description="Timer/Counter, 16-bit" register-group-key="tc5" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc5" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pl2" function="default" group="T"/>
                 <signal pad-id="pl1" function="default" group="ICP"/>
@@ -424,7 +424,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc4" name="TC4" module-key="tc16">
-            <register-group-instance key="tc4" name="TC4" description="Timer/Counter, 16-bit" register-group-key="tc4" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc4" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pbh7" function="default" group="T"/>
                 <signal pad-id="pl0" function="default" group="ICP"/>
@@ -434,7 +434,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
-            <register-group-instance key="tc3" name="TC3" description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe6" function="default" group="T"/>
                 <signal pad-id="pe7" function="default" group="ICP"/>
@@ -444,7 +444,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd6" function="default" group="T"/>
                 <signal pad-id="pd4" function="default" group="ICP"/>
@@ -454,7 +454,7 @@
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf4" function="default" group="TCK"/>
                 <signal pad-id="pf5" function="default" group="TMS"/>
@@ -463,7 +463,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="PCINT"/>
                 <signal pad-id="pb1" index="1" function="default" group="PCINT"/>
@@ -500,13 +500,13 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe7" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pf1" index="1" function="default" group="ADC"/>
@@ -527,13 +527,13 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2561.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2561.xml
index 1931bfc2..3ac5ee13 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2561.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2561.xml
@@ -193,14 +193,14 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe1" function="default" group="TXD"/>
                 <signal pad-id="pe0" function="default" group="RXD"/>
@@ -208,7 +208,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" function="default" group="TXD"/>
                 <signal pad-id="pd2" function="default" group="RXD"/>
@@ -216,14 +216,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="SDA"/>
                 <signal pad-id="pd0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="SS"/>
                 <signal pad-id="pb2" function="default" group="MOSI"/>
@@ -232,7 +232,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -245,7 +245,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -258,7 +258,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -271,7 +271,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -284,7 +284,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="P"/>
                 <signal pad-id="pe1" index="1" function="default" group="P"/>
@@ -297,7 +297,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="P"/>
                 <signal pad-id="pf1" index="1" function="default" group="P"/>
@@ -310,7 +310,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="default" group="P"/>
                 <signal pad-id="pg1" index="1" function="default" group="P"/>
@@ -323,7 +323,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd7" function="default" group="T"/>
                 <signal pad-id="pg5" function="default" group="OCB"/>
@@ -331,7 +331,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg4" index="1" function="default" group="TOSC"/>
                 <signal pad-id="pg3" index="2" function="default" group="TOSC"/>
@@ -339,19 +339,19 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc5" name="TC5" module-key="tc16">
-            <register-group-instance key="tc5" name="TC5" description="Timer/Counter, 16-bit" register-group-key="tc5" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc5" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc4" name="TC4" module-key="tc16">
-            <register-group-instance key="tc4" name="TC4" description="Timer/Counter, 16-bit" register-group-key="tc4" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc4" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
-            <register-group-instance key="tc3" name="TC3" description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe6" function="default" group="T"/>
                 <signal pad-id="pe7" function="default" group="ICP"/>
@@ -361,7 +361,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd6" function="default" group="T"/>
                 <signal pad-id="pd4" function="default" group="ICP"/>
@@ -371,7 +371,7 @@
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf4" function="default" group="TCK"/>
                 <signal pad-id="pf5" function="default" group="TMS"/>
@@ -380,7 +380,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="PCINT"/>
                 <signal pad-id="pb1" index="1" function="default" group="PCINT"/>
@@ -402,13 +402,13 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe7" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pf1" index="1" function="default" group="ADC"/>
@@ -421,13 +421,13 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2564RFR2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2564RFR2.xml
index 77e9465e..895f97c9 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2564RFR2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2564RFR2.xml
@@ -195,28 +195,28 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0_spi" name="USART0_SPI" module-key="spi">
-            <register-group-instance key="usart0_spi" name="USART0_SPI" description="Serial Peripheral Interface" register-group-key="usart0_spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="usart0_spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart1_spi" name="USART1_SPI" module-key="spi">
-            <register-group-instance key="usart1_spi" name="USART1_SPI" description="Serial Peripheral Interface" register-group-key="usart1_spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="usart1_spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -229,7 +229,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -242,7 +242,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -254,7 +254,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -267,7 +267,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
                 <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
@@ -275,61 +275,61 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc5" name="TC5" module-key="tc16">
-            <register-group-instance key="tc5" name="TC5" description="Timer/Counter, 16-bit" register-group-key="tc5" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc5" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc4" name="TC4" module-key="tc16">
-            <register-group-instance key="tc4" name="TC4" description="Timer/Counter, 16-bit" register-group-key="tc4" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc4" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
-            <register-group-instance key="tc3" name="TC3" description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="trx24" name="TRX24" module-key="trx24">
-            <register-group-instance key="trx24" name="TRX24" description="Low-Power 2.4 GHz Transceiver" register-group-key="trx24" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Low-Power 2.4 GHz Transceiver" register-group-key="trx24" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="symcnt" name="SYMCNT" module-key="symcnt">
-            <register-group-instance key="symcnt" name="SYMCNT" description="MAC Symbol Counter" register-group-key="symcnt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="MAC Symbol Counter" register-group-key="symcnt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="flash" name="FLASH" module-key="flash">
-            <register-group-instance key="flash" name="FLASH" description="FLASH Controller" register-group-key="flash" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="FLASH Controller" register-group-key="flash" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="pwrctrl" name="PWRCTRL" module-key="pwrctrl">
-            <register-group-instance key="pwrctrl" name="PWRCTRL" description="Power Controller" register-group-key="pwrctrl" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Power Controller" register-group-key="pwrctrl" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA256RFR2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA256RFR2.xml
index 1588931b..2bf30fc0 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA256RFR2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA256RFR2.xml
@@ -195,28 +195,28 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0_spi" name="USART0_SPI" module-key="spi">
-            <register-group-instance key="usart0_spi" name="USART0_SPI" description="Serial Peripheral Interface" register-group-key="usart0_spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="usart0_spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart1_spi" name="USART1_SPI" module-key="spi">
-            <register-group-instance key="usart1_spi" name="USART1_SPI" description="Serial Peripheral Interface" register-group-key="usart1_spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="usart1_spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -229,7 +229,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -242,7 +242,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -255,7 +255,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -268,7 +268,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="PORTG" group="P"/>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
@@ -279,61 +279,61 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc5" name="TC5" module-key="tc16">
-            <register-group-instance key="tc5" name="TC5" description="Timer/Counter, 16-bit" register-group-key="tc5" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc5" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc4" name="TC4" module-key="tc16">
-            <register-group-instance key="tc4" name="TC4" description="Timer/Counter, 16-bit" register-group-key="tc4" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc4" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
-            <register-group-instance key="tc3" name="TC3" description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="trx24" name="TRX24" module-key="trx24">
-            <register-group-instance key="trx24" name="TRX24" description="Low-Power 2.4 GHz Transceiver" register-group-key="trx24" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Low-Power 2.4 GHz Transceiver" register-group-key="trx24" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="symcnt" name="SYMCNT" module-key="symcnt">
-            <register-group-instance key="symcnt" name="SYMCNT" description="MAC Symbol Counter" register-group-key="symcnt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="MAC Symbol Counter" register-group-key="symcnt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="flash" name="FLASH" module-key="flash">
-            <register-group-instance key="flash" name="FLASH" description="FLASH Controller" register-group-key="flash" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="FLASH Controller" register-group-key="flash" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="pwrctrl" name="PWRCTRL" module-key="pwrctrl">
-            <register-group-instance key="pwrctrl" name="PWRCTRL" description="Power Controller" register-group-key="pwrctrl" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Power Controller" register-group-key="pwrctrl" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32.xml
index a1da2223..9d586052 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32.xml
@@ -218,13 +218,13 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" index="2" function="default" group="INT"/>
                 <signal pad-id="pd3" index="1" function="default" group="INT"/>
@@ -232,14 +232,14 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb3" function="default" group="OC"/>
                 <signal pad-id="pb0" function="default" group="T"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc7" index="2" function="default" group="TOSC"/>
                 <signal pad-id="pc6" index="1" function="default" group="TOSC"/>
@@ -247,7 +247,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" function="default" group="T"/>
                 <signal pad-id="pd6" function="default" group="ICP"/>
@@ -256,7 +256,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb7" function="default" group="SCK"/>
                 <signal pad-id="pb6" function="default" group="MISO"/>
@@ -265,7 +265,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart" name="USART" module-key="usart">
-            <register-group-instance key="usart" name="USART" description="USART" register-group-key="usart" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="XCK"/>
                 <signal pad-id="pd1" function="default" group="TXD"/>
@@ -273,14 +273,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb3" index="1" function="default" group="AIN"/>
                 <signal pad-id="pb2" index="0" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa7" index="7" function="default" group="ADC"/>
                 <signal pad-id="pa6" index="6" function="default" group="ADC"/>
@@ -293,7 +293,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -306,7 +306,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -319,7 +319,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -332,7 +332,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -345,26 +345,26 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc1" function="default" group="SDA"/>
                 <signal pad-id="pc0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc5" function="default" group="TDI"/>
                 <signal pad-id="pc4" function="default" group="TDO"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3208.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3208.xml
index d6dc4a99..bdc215b5 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3208.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3208.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd5" index="1" function="AC0" group="N"/>
@@ -55,7 +55,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
@@ -72,10 +72,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="i2128">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN"/>
@@ -99,7 +99,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2600_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa0" function="CLKCTRL" group="CLKI"/>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKO"/>
@@ -108,16 +108,16 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="i2122">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2600_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -128,19 +128,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2600_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="i2600_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i2600_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="i2109">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -153,7 +153,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -162,7 +162,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
@@ -175,7 +175,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -187,25 +187,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2600_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="i2600_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="i2112">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="i2107">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc1" function="SPI_ALT" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
                 <signal pad-id="pa5" function="SPI" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
@@ -218,10 +218,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2600_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pd0" index="0" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -248,27 +248,27 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA80"/>
             <signals>
                 <signal pad-id="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="i2119">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xA90"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA90"/>
             <signals>
                 <signal pad-id="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="i2119">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xAA0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pf3" function="I2C_ALT2" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
                 <signal pad-id="pc3" function="I2C_ALT" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
@@ -279,7 +279,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -292,7 +292,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="i2108">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -301,7 +301,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="i2108">
-            <register-group-instance key="usart2" name="USART2" register-group-key="usart" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
                 <signal pad-id="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
@@ -313,31 +313,31 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="i2103_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="i2103_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="i2103_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="i2103_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vporte" name="VPORTE" module-key="i2103_vport">
-            <register-group-instance key="vporte" name="VPORTE" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="i2103_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="i2600_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i2127">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3209.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3209.xml
index 9f48e402..df7881e9 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3209.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3209.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd5" index="1" function="AC0" group="N"/>
@@ -55,7 +55,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
@@ -76,10 +76,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="i2128">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN"/>
@@ -104,7 +104,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2600_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa0" function="CLKCTRL" group="CLKI"/>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKO"/>
@@ -113,16 +113,16 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="i2122">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2600_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -136,19 +136,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2600_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="i2600_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i2600_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="i2109">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -161,7 +161,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -172,7 +172,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -185,7 +185,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
@@ -198,7 +198,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pe1" index="1" function="IOPORT" group="PIN"/>
@@ -207,7 +207,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -219,25 +219,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2600_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="i2600_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="i2112">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="i2107">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pe1" function="SPI_ALT2" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
                 <signal pad-id="pc1" function="SPI_ALT" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
@@ -254,10 +254,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2600_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pe0" index="0" function="TCA_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -296,35 +296,35 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA80"/>
             <signals>
                 <signal pad-id="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="i2119">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xA90"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA90"/>
             <signals>
                 <signal pad-id="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="i2119">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xAA0"/>
             <signals>
                 <signal pad-id="pb4" index="0" function="TCB2_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcb3" name="TCB3" module-key="i2119">
-            <register-group-instance key="tcb3" name="TCB3" register-group-key="tcb" address-space-key="data" offset="0xAB0"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xAB0"/>
             <signals>
                 <signal pad-id="pc1" index="0" function="TCB3_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
                 <signal pad-id="pb5" index="0" function="TCB3" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pf3" function="I2C_ALT2" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
                 <signal pad-id="pc3" function="I2C_ALT" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
@@ -335,7 +335,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -348,7 +348,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="i2108">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc5" function="USART1_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -361,7 +361,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="i2108">
-            <register-group-instance key="usart2" name="USART2" register-group-key="usart" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
                 <signal pad-id="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
@@ -373,7 +373,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="i2108">
-            <register-group-instance key="usart3" name="USART3" register-group-key="usart" address-space-key="data" offset="0x860"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x860"/>
             <signals>
                 <signal pad-id="pb5" function="USART3_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
                 <signal pad-id="pb1" function="USART3" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
@@ -384,31 +384,31 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="i2103_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="i2103_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="i2103_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="i2103_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vporte" name="VPORTE" module-key="i2103_vport">
-            <register-group-instance key="vporte" name="VPORTE" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="i2103_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="i2600_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i2127">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324A.xml
index dce8668e..41dc0738 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324A.xml
@@ -218,14 +218,14 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pb3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="TXD"/>
                 <signal pad-id="pd0" function="default" group="RXD"/>
@@ -233,7 +233,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" function="default" group="TXD"/>
                 <signal pad-id="pd2" function="default" group="RXD"/>
@@ -241,7 +241,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -254,7 +254,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -267,7 +267,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -280,7 +280,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -293,7 +293,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="T"/>
                 <signal pad-id="pb4" function="default" group="OCB"/>
@@ -301,17 +301,17 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd7" function="default" group="OCA"/>
                 <signal pad-id="pd6" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc2" function="default" group="TCK"/>
                 <signal pad-id="pc3" function="default" group="TMS"/>
@@ -320,10 +320,10 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="PCINT"/>
                 <signal pad-id="pa1" index="1" function="default" group="PCINT"/>
@@ -363,7 +363,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="default" group="ADC"/>
@@ -376,7 +376,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" function="default" group="T"/>
                 <signal pad-id="pd6" function="default" group="ICP"/>
@@ -385,10 +385,10 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb4" function="default" group="SS"/>
                 <signal pad-id="pb5" function="default" group="MOSI"/>
@@ -397,23 +397,23 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc1" function="default" group="SDA"/>
                 <signal pad-id="pc0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324P.xml
index 1453eec3..e0027895 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324P.xml
@@ -218,14 +218,14 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pb3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="TXD"/>
                 <signal pad-id="pd0" function="default" group="RXD"/>
@@ -233,7 +233,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" function="default" group="TXD"/>
                 <signal pad-id="pd2" function="default" group="RXD"/>
@@ -241,7 +241,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -254,7 +254,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -267,7 +267,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -280,7 +280,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -293,7 +293,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="T"/>
                 <signal pad-id="pb4" function="default" group="OCB"/>
@@ -301,17 +301,17 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd7" function="default" group="OCA"/>
                 <signal pad-id="pd6" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc2" function="default" group="TCK"/>
                 <signal pad-id="pc3" function="default" group="TMS"/>
@@ -320,10 +320,10 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="PCINT"/>
                 <signal pad-id="pa1" index="1" function="default" group="PCINT"/>
@@ -363,7 +363,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="default" group="ADC"/>
@@ -376,7 +376,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" function="default" group="T"/>
                 <signal pad-id="pd6" function="default" group="ICP"/>
@@ -385,10 +385,10 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb4" function="default" group="SS"/>
                 <signal pad-id="pb5" function="default" group="MOSI"/>
@@ -397,23 +397,23 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc1" function="default" group="SDA"/>
                 <signal pad-id="pc0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PA.xml
index 5d69d21f..ff69413b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PA.xml
@@ -218,14 +218,14 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pb3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="TXD"/>
                 <signal pad-id="pd0" function="default" group="RXD"/>
@@ -233,7 +233,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" function="default" group="TXD"/>
                 <signal pad-id="pd2" function="default" group="RXD"/>
@@ -241,7 +241,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -254,7 +254,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -267,7 +267,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -280,7 +280,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -293,7 +293,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="T"/>
                 <signal pad-id="pb4" function="default" group="OCB"/>
@@ -301,17 +301,17 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd7" function="default" group="OCA"/>
                 <signal pad-id="pd6" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc2" function="default" group="TCK"/>
                 <signal pad-id="pc3" function="default" group="TMS"/>
@@ -320,10 +320,10 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="PCINT"/>
                 <signal pad-id="pa1" index="1" function="default" group="PCINT"/>
@@ -363,7 +363,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="default" group="ADC"/>
@@ -376,7 +376,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" function="default" group="T"/>
                 <signal pad-id="pd6" function="default" group="ICP"/>
@@ -385,10 +385,10 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb4" function="default" group="SS"/>
                 <signal pad-id="pb5" function="default" group="MOSI"/>
@@ -397,23 +397,23 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc1" function="default" group="SDA"/>
                 <signal pad-id="pc0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PB.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PB.xml
index 4b0dbe73..505c5df9 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PB.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PB.xml
@@ -218,7 +218,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc5" function="default" group="AC"/>
                 <signal pad-id="pb2" function="default" group="AIN0"/>
@@ -226,7 +226,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="TXD"/>
                 <signal pad-id="pd0" function="default" group="RXD"/>
@@ -234,7 +234,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" function="default" group="TXD"/>
                 <signal pad-id="pd2" function="default" group="RXD"/>
@@ -242,7 +242,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="usart">
-            <register-group-instance key="usart2" name="USART2" description="USART" register-group-key="usart2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe3" function="default" group="TXD"/>
                 <signal pad-id="pe2" function="default" group="RXD"/>
@@ -250,7 +250,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="PORTA"/>
                 <signal pad-id="pa1" index="1" function="default" group="PORTA"/>
@@ -263,7 +263,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="PORTB"/>
                 <signal pad-id="pb1" index="1" function="default" group="PORTB"/>
@@ -276,7 +276,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="PORTC"/>
                 <signal pad-id="pc1" index="1" function="default" group="PORTC"/>
@@ -289,7 +289,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="PORTD"/>
                 <signal pad-id="pd1" index="1" function="default" group="PORTD"/>
@@ -302,7 +302,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="PORTE"/>
                 <signal pad-id="pe1" index="1" function="default" group="PORTE"/>
@@ -314,7 +314,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="T"/>
                 <signal pad-id="pb4" function="default" group="OCB"/>
@@ -322,7 +322,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" function="default" group="T"/>
                 <signal pad-id="pd6" function="default" group="ICP"/>
@@ -331,7 +331,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
-            <register-group-instance key="tc3" name="TC3" description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" function="default" group="T"/>
                 <signal pad-id="pb5" function="default" group="ICP"/>
@@ -340,7 +340,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc4" name="TC4" module-key="tc16">
-            <register-group-instance key="tc4" name="TC4" description="Timer/Counter, 16-bit" register-group-key="tc4" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc4" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc2" function="default" group="T"/>
                 <signal pad-id="pc3" function="default" group="ICP"/>
@@ -349,14 +349,14 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd7" function="default" group="OCA"/>
                 <signal pad-id="pd6" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="ptc">
             <signals>
@@ -411,7 +411,7 @@
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc2" function="default" group="TCK"/>
                 <signal pad-id="pc3" function="default" group="TMS"/>
@@ -420,7 +420,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="PCINT"/>
                 <signal pad-id="pa1" index="1" function="default" group="PCINT"/>
@@ -462,7 +462,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" function="default" group="ADC0"/>
                 <signal pad-id="pa1" function="default" group="ADC1"/>
@@ -475,10 +475,10 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi">
-            <register-group-instance key="spi0" name="SPI0" description="Serial Peripheral Interface" register-group-key="spi0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb4" function="default" group="SS"/>
                 <signal pad-id="pb5" function="default" group="MOSI"/>
@@ -487,7 +487,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi">
-            <register-group-instance key="spi1" name="SPI1" description="Serial Peripheral Interface" register-group-key="spi1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd6" function="default" group="SS"/>
                 <signal pad-id="pd7" function="default" group="SCK"/>
@@ -496,33 +496,33 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="twi">
-            <register-group-instance key="twi0" name="TWI0" description="Two Wire Serial Interface" register-group-key="twi0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc1" function="default" group="SDA0"/>
                 <signal pad-id="pc0" function="default" group="SCL0"/>
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="twi">
-            <register-group-instance key="twi1" name="TWI1" description="Two Wire Serial Interface" register-group-key="twi1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe5" function="default" group="SDA1"/>
                 <signal pad-id="pe6" function="default" group="SCL1"/>
             </signals>
         </peripheral>
         <peripheral key="cfd" name="CFD" module-key="cfd">
-            <register-group-instance key="cfd" name="CFD" description="Clock Failure Detection" register-group-key="cfd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Clock Failure Detection" register-group-key="cfd" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325.xml
index 9f021a78..63d732bc 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325.xml
@@ -192,34 +192,34 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -232,7 +232,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -245,7 +245,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -258,7 +258,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -271,7 +271,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -284,7 +284,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -297,7 +297,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="PORTG" group="P"/>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
@@ -308,25 +308,25 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250.xml
index 6b268485..30f7e9de 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250.xml
@@ -192,25 +192,25 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -223,7 +223,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -236,7 +236,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -249,7 +249,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -262,7 +262,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -275,7 +275,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -288,7 +288,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="PORTG" group="P"/>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
@@ -299,7 +299,7 @@
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
-            <register-group-instance key="porth" name="PORTH" description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="ph0" index="0" function="PORTH" group="P"/>
                 <signal pad-id="ph1" index="1" function="PORTH" group="P"/>
@@ -312,7 +312,7 @@
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
-            <register-group-instance key="portj" name="PORTJ" description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pj0" index="0" function="PORTJ" group="P"/>
                 <signal pad-id="pj1" index="1" function="PORTJ" group="P"/>
@@ -324,34 +324,34 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250A.xml
index 13ad9a2d..4d82e6c7 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250A.xml
@@ -192,25 +192,25 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -223,7 +223,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -236,7 +236,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -249,7 +249,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -262,7 +262,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -275,7 +275,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -288,7 +288,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="PORTG" group="P"/>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
@@ -299,7 +299,7 @@
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
-            <register-group-instance key="porth" name="PORTH" description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="ph0" index="0" function="PORTH" group="P"/>
                 <signal pad-id="ph1" index="1" function="PORTH" group="P"/>
@@ -312,7 +312,7 @@
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
-            <register-group-instance key="portj" name="PORTJ" description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pj0" index="0" function="PORTJ" group="P"/>
                 <signal pad-id="pj1" index="1" function="PORTJ" group="P"/>
@@ -324,34 +324,34 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250P.xml
index 0e4b6e1f..85113cb3 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250P.xml
@@ -192,25 +192,25 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -223,7 +223,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -236,7 +236,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -249,7 +249,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -262,7 +262,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -275,7 +275,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -288,7 +288,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="PORTG" group="P"/>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
@@ -299,7 +299,7 @@
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
-            <register-group-instance key="porth" name="PORTH" description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="ph0" index="0" function="PORTH" group="P"/>
                 <signal pad-id="ph1" index="1" function="PORTH" group="P"/>
@@ -312,7 +312,7 @@
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
-            <register-group-instance key="portj" name="PORTJ" description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pj0" index="0" function="PORTJ" group="P"/>
                 <signal pad-id="pj1" index="1" function="PORTJ" group="P"/>
@@ -324,34 +324,34 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250PA.xml
index dd77c708..888f763d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250PA.xml
@@ -192,25 +192,25 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -223,7 +223,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -236,7 +236,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -249,7 +249,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -262,7 +262,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -275,7 +275,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -288,7 +288,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="PORTG" group="P"/>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
@@ -299,7 +299,7 @@
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
-            <register-group-instance key="porth" name="PORTH" description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="ph0" index="0" function="PORTH" group="P"/>
                 <signal pad-id="ph1" index="1" function="PORTH" group="P"/>
@@ -312,7 +312,7 @@
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
-            <register-group-instance key="portj" name="PORTJ" description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pj0" index="0" function="PORTJ" group="P"/>
                 <signal pad-id="pj1" index="1" function="PORTJ" group="P"/>
@@ -324,34 +324,34 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325A.xml
index 848f93bc..9f542309 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325A.xml
@@ -192,34 +192,34 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -232,7 +232,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -245,7 +245,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -258,7 +258,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -271,7 +271,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -284,7 +284,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -297,7 +297,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="PORTG" group="P"/>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
@@ -308,25 +308,25 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325P.xml
index 035a20c0..ca12d1e9 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325P.xml
@@ -192,34 +192,34 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -232,7 +232,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -245,7 +245,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -258,7 +258,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -271,7 +271,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -284,7 +284,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -297,7 +297,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="PORTG" group="P"/>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
@@ -308,25 +308,25 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325PA.xml
index ba29dd25..4251f178 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325PA.xml
@@ -192,34 +192,34 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -232,7 +232,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -245,7 +245,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -258,7 +258,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -271,7 +271,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -284,7 +284,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -297,7 +297,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="PORTG" group="P"/>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
@@ -308,25 +308,25 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328.xml
index 1ed1f2e5..8895f0f9 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328.xml
@@ -218,7 +218,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="TXD"/>
                 <signal pad-id="pd0" function="default" group="RXD"/>
@@ -226,14 +226,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc4" function="default" group="SDA"/>
                 <signal pad-id="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd5" function="default" group="T"/>
                 <signal pad-id="pb0" function="default" group="ICP"/>
@@ -242,14 +242,14 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb3" function="default" group="OCA"/>
                 <signal pad-id="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pc1" index="1" function="default" group="ADC"/>
@@ -260,14 +260,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="default" group="AIN"/>
                 <signal pad-id="pd7" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -280,7 +280,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -292,7 +292,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -305,7 +305,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd4" function="default" group="T"/>
                 <signal pad-id="pd5" function="default" group="OCB"/>
@@ -313,7 +313,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" index="1" function="default" group="INT"/>
                 <signal pad-id="pd3" index="19" function="default" group="PCINT"/>
@@ -343,7 +343,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" function="default" group="SS"/>
                 <signal pad-id="pb3" function="default" group="MOSI"/>
@@ -352,22 +352,22 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328P.xml
index 1657a6b0..4b76652b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328P.xml
@@ -218,7 +218,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="TXD"/>
                 <signal pad-id="pd0" function="default" group="RXD"/>
@@ -226,14 +226,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc4" function="default" group="SDA"/>
                 <signal pad-id="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd5" function="default" group="T"/>
                 <signal pad-id="pb0" function="default" group="ICP"/>
@@ -242,14 +242,14 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb3" function="default" group="OCA"/>
                 <signal pad-id="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pc1" index="1" function="default" group="ADC"/>
@@ -260,14 +260,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="default" group="AIN"/>
                 <signal pad-id="pd7" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -280,7 +280,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -292,7 +292,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -305,7 +305,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd4" function="default" group="T"/>
                 <signal pad-id="pd5" function="default" group="OCB"/>
@@ -313,7 +313,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" index="1" function="default" group="INT"/>
                 <signal pad-id="pd3" index="19" function="default" group="PCINT"/>
@@ -343,7 +343,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" function="default" group="SS"/>
                 <signal pad-id="pb3" function="default" group="MOSI"/>
@@ -352,22 +352,22 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328PB.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328PB.xml
index a56a4345..31a6db92 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328PB.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328PB.xml
@@ -215,7 +215,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="TXD"/>
                 <signal pad-id="pd0" function="default" group="RXD"/>
@@ -223,7 +223,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="usart1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb3" function="default" group="TXD"/>
                 <signal pad-id="pb4" function="default" group="RXD"/>
@@ -231,21 +231,21 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="twi">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi0" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="twi0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc4" function="default" group="SDA"/>
                 <signal pad-id="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="twi">
-            <register-group-instance key="twi1" name="TWI1" register-group-key="twi1" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="twi1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" function="default" group="SDA"/>
                 <signal pad-id="pe1" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd5" function="default" group="T"/>
                 <signal pad-id="pb0" function="default" group="ICP"/>
@@ -254,7 +254,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
-            <register-group-instance key="tc3" name="TC3" register-group-key="tc3" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="tc3" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe3" function="default" group="T"/>
                 <signal pad-id="pe2" function="default" group="ICP"/>
@@ -263,7 +263,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc4" name="TC4" module-key="tc16">
-            <register-group-instance key="tc4" name="TC4" register-group-key="tc4" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="tc4" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe1" function="default" group="T"/>
                 <signal pad-id="pe0" function="default" group="ICP"/>
@@ -272,14 +272,14 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb3" function="default" group="OCA"/>
                 <signal pad-id="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pc1" index="1" function="default" group="ADC"/>
@@ -292,7 +292,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" function="default" group="AC"/>
                 <signal pad-id="pd6" index="0" function="default" group="AIN"/>
@@ -300,7 +300,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -313,7 +313,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -325,7 +325,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -338,7 +338,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="P"/>
                 <signal pad-id="pe1" index="1" function="default" group="P"/>
@@ -347,7 +347,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd4" function="default" group="T"/>
                 <signal pad-id="pd5" function="default" group="OCB"/>
@@ -355,7 +355,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" index="1" function="default" group="INT"/>
                 <signal pad-id="pd3" index="19" function="default" group="PCINT"/>
@@ -388,7 +388,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi0" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="spi0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" function="default" group="SS"/>
                 <signal pad-id="pb3" function="default" group="MOSI"/>
@@ -397,7 +397,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi">
-            <register-group-instance key="spi1" name="SPI1" register-group-key="spi1" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="spi1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe2" function="default" group="SS"/>
                 <signal pad-id="pc1" function="default" group="SCK"/>
@@ -406,7 +406,7 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="ptc">
             <signals>
@@ -453,22 +453,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="cfd" name="CFD" module-key="cfd">
-            <register-group-instance key="cfd" name="CFD" register-group-key="cfd" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="cfd" address-space-key="data" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329.xml
index 41df7329..3e14bd82 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329.xml
@@ -192,14 +192,14 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg4" function="default" group="T"/>
                 <signal pad-id="pb4" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg3" function="default" group="T"/>
                 <signal pad-id="pd0" function="default" group="ICP"/>
@@ -209,20 +209,20 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb7" function="default" group="OCA"/>
                 <signal pad-id="xtal2" function="default" group="TOSC"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="SS"/>
                 <signal pad-id="pb1" function="default" group="SCK"/>
@@ -231,7 +231,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -244,7 +244,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -257,7 +257,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -270,7 +270,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -283,7 +283,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="P"/>
                 <signal pad-id="pe1" index="1" function="default" group="P"/>
@@ -296,7 +296,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="P"/>
                 <signal pad-id="pf1" index="1" function="default" group="P"/>
@@ -309,7 +309,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="default" group="P"/>
                 <signal pad-id="pg1" index="1" function="default" group="P"/>
@@ -320,14 +320,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf4" function="default" group="TCK"/>
                 <signal pad-id="pf5" function="default" group="TMS"/>
@@ -336,7 +336,7 @@
             </signals>
         </peripheral>
         <peripheral key="lcd" name="LCD" module-key="lcd">
-            <register-group-instance key="lcd" name="LCD" description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa4" index="0" function="default" group="SEG"/>
                 <signal pad-id="pa5" index="1" function="default" group="SEG"/>
@@ -370,7 +370,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="PCINT"/>
                 <signal pad-id="pe1" index="1" function="default" group="PCINT"/>
@@ -392,20 +392,20 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe7" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe5" function="default" group="DI"/>
                 <signal pad-id="pe6" function="default" group="DO"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pf1" index="1" function="default" group="ADC"/>
@@ -418,10 +418,10 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" function="default" group="RXD"/>
                 <signal pad-id="pe1" function="default" group="TXD"/>
@@ -430,10 +430,10 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290.xml
index dd967df7..d7263f48 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290.xml
@@ -192,25 +192,25 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -223,7 +223,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -236,7 +236,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -249,7 +249,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -262,7 +262,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -275,7 +275,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -288,7 +288,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="PORTG" group="P"/>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
@@ -299,7 +299,7 @@
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
-            <register-group-instance key="porth" name="PORTH" description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="ph0" index="0" function="PORTH" group="P"/>
                 <signal pad-id="ph1" index="1" function="PORTH" group="P"/>
@@ -312,7 +312,7 @@
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
-            <register-group-instance key="portj" name="PORTJ" description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pj0" index="0" function="PORTJ" group="P"/>
                 <signal pad-id="pj1" index="1" function="PORTJ" group="P"/>
@@ -324,37 +324,37 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="lcd" name="LCD" module-key="lcd">
-            <register-group-instance key="lcd" name="LCD" description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290A.xml
index 802fe4e8..188b73c7 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290A.xml
@@ -192,25 +192,25 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -223,7 +223,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -236,7 +236,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -249,7 +249,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -262,7 +262,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -275,7 +275,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -288,7 +288,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="PORTG" group="P"/>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
@@ -299,7 +299,7 @@
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
-            <register-group-instance key="porth" name="PORTH" description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="ph0" index="0" function="PORTH" group="P"/>
                 <signal pad-id="ph1" index="1" function="PORTH" group="P"/>
@@ -312,7 +312,7 @@
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
-            <register-group-instance key="portj" name="PORTJ" description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pj0" index="0" function="PORTJ" group="P"/>
                 <signal pad-id="pj1" index="1" function="PORTJ" group="P"/>
@@ -324,37 +324,37 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="lcd" name="LCD" module-key="lcd">
-            <register-group-instance key="lcd" name="LCD" description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290P.xml
index 34e739e9..c0cbf860 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290P.xml
@@ -192,25 +192,25 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -223,7 +223,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -236,7 +236,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -249,7 +249,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -262,7 +262,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -275,7 +275,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -288,7 +288,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="PORTG" group="P"/>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
@@ -299,7 +299,7 @@
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
-            <register-group-instance key="porth" name="PORTH" description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="ph0" index="0" function="PORTH" group="P"/>
                 <signal pad-id="ph1" index="1" function="PORTH" group="P"/>
@@ -312,7 +312,7 @@
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
-            <register-group-instance key="portj" name="PORTJ" description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pj0" index="0" function="PORTJ" group="P"/>
                 <signal pad-id="pj1" index="1" function="PORTJ" group="P"/>
@@ -324,37 +324,37 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="lcd" name="LCD" module-key="lcd">
-            <register-group-instance key="lcd" name="LCD" description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290PA.xml
index b4581215..fd9b1bfb 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290PA.xml
@@ -192,25 +192,25 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -223,7 +223,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -236,7 +236,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -249,7 +249,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -262,7 +262,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -275,7 +275,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -288,7 +288,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="PORTG" group="P"/>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
@@ -299,7 +299,7 @@
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
-            <register-group-instance key="porth" name="PORTH" description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="ph0" index="0" function="PORTH" group="P"/>
                 <signal pad-id="ph1" index="1" function="PORTH" group="P"/>
@@ -312,7 +312,7 @@
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
-            <register-group-instance key="portj" name="PORTJ" description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pj0" index="0" function="PORTJ" group="P"/>
                 <signal pad-id="pj1" index="1" function="PORTJ" group="P"/>
@@ -324,37 +324,37 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="lcd" name="LCD" module-key="lcd">
-            <register-group-instance key="lcd" name="LCD" description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329A.xml
index 51fa0173..115f3065 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329A.xml
@@ -192,14 +192,14 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg4" function="default" group="T"/>
                 <signal pad-id="pb4" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg3" function="default" group="T"/>
                 <signal pad-id="pd0" function="default" group="ICP"/>
@@ -209,20 +209,20 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb7" function="default" group="OCA"/>
                 <signal pad-id="xtal2" function="default" group="TOSC"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="SS"/>
                 <signal pad-id="pb1" function="default" group="SCK"/>
@@ -231,7 +231,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -244,7 +244,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -257,7 +257,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -270,7 +270,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -283,7 +283,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="P"/>
                 <signal pad-id="pe1" index="1" function="default" group="P"/>
@@ -296,7 +296,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="P"/>
                 <signal pad-id="pf1" index="1" function="default" group="P"/>
@@ -309,7 +309,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="default" group="P"/>
                 <signal pad-id="pg1" index="1" function="default" group="P"/>
@@ -320,14 +320,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf4" function="default" group="TCK"/>
                 <signal pad-id="pf5" function="default" group="TMS"/>
@@ -336,7 +336,7 @@
             </signals>
         </peripheral>
         <peripheral key="lcd" name="LCD" module-key="lcd">
-            <register-group-instance key="lcd" name="LCD" description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa4" index="0" function="default" group="SEG"/>
                 <signal pad-id="pa5" index="1" function="default" group="SEG"/>
@@ -370,7 +370,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="PCINT"/>
                 <signal pad-id="pe1" index="1" function="default" group="PCINT"/>
@@ -392,20 +392,20 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe7" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe5" function="default" group="DI"/>
                 <signal pad-id="pe6" function="default" group="DO"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pf1" index="1" function="default" group="ADC"/>
@@ -418,10 +418,10 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" function="default" group="RXD"/>
                 <signal pad-id="pe1" function="default" group="TXD"/>
@@ -430,10 +430,10 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329P.xml
index 3d234033..93826ed3 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329P.xml
@@ -192,14 +192,14 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg4" function="default" group="T"/>
                 <signal pad-id="pb4" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg3" function="default" group="T"/>
                 <signal pad-id="pd0" function="default" group="ICP"/>
@@ -209,20 +209,20 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb7" function="default" group="OCA"/>
                 <signal pad-id="xtal2" function="default" group="TOSC"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="SS"/>
                 <signal pad-id="pb1" function="default" group="SCK"/>
@@ -231,7 +231,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -244,7 +244,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -257,7 +257,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -270,7 +270,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -283,7 +283,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="P"/>
                 <signal pad-id="pe1" index="1" function="default" group="P"/>
@@ -296,7 +296,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="P"/>
                 <signal pad-id="pf1" index="1" function="default" group="P"/>
@@ -309,7 +309,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="default" group="P"/>
                 <signal pad-id="pg1" index="1" function="default" group="P"/>
@@ -320,14 +320,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf4" function="default" group="TCK"/>
                 <signal pad-id="pf5" function="default" group="TMS"/>
@@ -336,7 +336,7 @@
             </signals>
         </peripheral>
         <peripheral key="lcd" name="LCD" module-key="lcd">
-            <register-group-instance key="lcd" name="LCD" description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa4" index="0" function="default" group="SEG"/>
                 <signal pad-id="pa5" index="1" function="default" group="SEG"/>
@@ -370,7 +370,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="PCINT"/>
                 <signal pad-id="pe1" index="1" function="default" group="PCINT"/>
@@ -392,20 +392,20 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe7" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe5" function="default" group="DI"/>
                 <signal pad-id="pe6" function="default" group="DO"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pf1" index="1" function="default" group="ADC"/>
@@ -418,10 +418,10 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" function="default" group="RXD"/>
                 <signal pad-id="pe1" function="default" group="TXD"/>
@@ -430,10 +430,10 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329PA.xml
index 57815f2e..5ab770f8 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329PA.xml
@@ -192,14 +192,14 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg4" function="default" group="T"/>
                 <signal pad-id="pb4" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg3" function="default" group="T"/>
                 <signal pad-id="pd0" function="default" group="ICP"/>
@@ -209,20 +209,20 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb7" function="default" group="OCA"/>
                 <signal pad-id="xtal2" function="default" group="TOSC"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="SS"/>
                 <signal pad-id="pb1" function="default" group="SCK"/>
@@ -231,7 +231,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -244,7 +244,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -257,7 +257,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -270,7 +270,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -283,7 +283,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="P"/>
                 <signal pad-id="pe1" index="1" function="default" group="P"/>
@@ -296,7 +296,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="P"/>
                 <signal pad-id="pf1" index="1" function="default" group="P"/>
@@ -309,7 +309,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="default" group="P"/>
                 <signal pad-id="pg1" index="1" function="default" group="P"/>
@@ -320,14 +320,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf4" function="default" group="TCK"/>
                 <signal pad-id="pf5" function="default" group="TMS"/>
@@ -336,7 +336,7 @@
             </signals>
         </peripheral>
         <peripheral key="lcd" name="LCD" module-key="lcd">
-            <register-group-instance key="lcd" name="LCD" description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa4" index="0" function="default" group="SEG"/>
                 <signal pad-id="pa5" index="1" function="default" group="SEG"/>
@@ -370,7 +370,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="PCINT"/>
                 <signal pad-id="pe1" index="1" function="default" group="PCINT"/>
@@ -392,20 +392,20 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe7" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe5" function="default" group="DI"/>
                 <signal pad-id="pe6" function="default" group="DO"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pf1" index="1" function="default" group="ADC"/>
@@ -418,10 +418,10 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" function="default" group="RXD"/>
                 <signal pad-id="pe1" function="default" group="TXD"/>
@@ -430,10 +430,10 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32A.xml
index 5761766f..17b4021a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32A.xml
@@ -218,33 +218,33 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd2" index="1" function="default" group="INT"/>
                 <signal pad-id="pd3" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="T"/>
                 <signal pad-id="pb3" function="default" group="OC"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd7" function="default" group="OC"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd5" function="default" group="OCA"/>
                 <signal pad-id="pd4" function="default" group="OCB"/>
@@ -253,7 +253,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb6" function="default" group="MISO"/>
                 <signal pad-id="pb5" function="default" group="MOSI"/>
@@ -262,7 +262,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart" name="USART" module-key="usart">
-            <register-group-instance key="usart" name="USART" description="USART" register-group-key="usart" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" function="default" group="RXD"/>
                 <signal pad-id="pd1" function="default" group="TXD"/>
@@ -270,14 +270,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pb3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="default" group="ADC"/>
@@ -290,7 +290,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -303,7 +303,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -316,7 +316,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -329,7 +329,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -342,23 +342,23 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc1" function="default" group="SDA"/>
                 <signal pad-id="pc0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32C1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32C1.xml
index 41ac2062..16eccc1a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32C1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32C1.xml
@@ -192,7 +192,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -205,7 +205,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -218,7 +218,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
@@ -231,7 +231,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pe1" index="1" function="IOPORT" group="PIN"/>
@@ -239,10 +239,10 @@
             </signals>
         </peripheral>
         <peripheral key="can" name="CAN" module-key="can">
-            <register-group-instance key="can" name="CAN" description="Controller Area Network" register-group-key="can" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Controller Area Network" register-group-key="can" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd7" index="0" function="AC" group="ACMP"/>
                 <signal pad-id="pc6" index="1" function="AC" group="ACMP"/>
@@ -255,16 +255,16 @@
             </signals>
         </peripheral>
         <peripheral key="dac" name="DAC" module-key="dac">
-            <register-group-instance key="dac" name="DAC" description="Digital-to-Analog Converter" register-group-key="dac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Digital-to-Analog Converter" register-group-key="dac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc7" function="DAC" group="D2A"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc2" function="TC0" group="T0"/>
                 <signal pad-id="pd3" function="TC0" group="OC0A"/>
@@ -272,7 +272,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc3" function="TC1" group="T1"/>
                 <signal pad-id="pd4" function="TC1" group="ICP1A"/>
@@ -282,7 +282,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe2" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pd4" index="1" function="ADC" group="ADC"/>
@@ -298,14 +298,14 @@
             </signals>
         </peripheral>
         <peripheral key="linuart" name="LINUART" module-key="linuart">
-            <register-group-instance key="linuart" name="LINUART" description="Local Interconnect Network" register-group-key="linuart" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Local Interconnect Network" register-group-key="linuart" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" function="LIN" group="TXLIN"/>
                 <signal pad-id="pd4" function="LIN" group="RXLIN"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="SPI" group="MISO"/>
                 <signal pad-id="pd2" function="SPI_ALT" group="MISO"/>
@@ -318,10 +318,10 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="EXINT" group="INT"/>
                 <signal pad-id="pb2" index="1" function="EXINT" group="INT"/>
@@ -357,13 +357,13 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32M1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32M1.xml
index 3a4ab2eb..92840a21 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32M1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32M1.xml
@@ -192,7 +192,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -205,7 +205,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -218,7 +218,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
@@ -231,7 +231,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pe1" index="1" function="IOPORT" group="PIN"/>
@@ -239,10 +239,10 @@
             </signals>
         </peripheral>
         <peripheral key="can" name="CAN" module-key="can">
-            <register-group-instance key="can" name="CAN" description="Controller Area Network" register-group-key="can" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Controller Area Network" register-group-key="can" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd7" index="0" function="AC" group="ACMP"/>
                 <signal pad-id="pc6" index="1" function="AC" group="ACMP"/>
@@ -255,16 +255,16 @@
             </signals>
         </peripheral>
         <peripheral key="dac" name="DAC" module-key="dac">
-            <register-group-instance key="dac" name="DAC" description="Digital-to-Analog Converter" register-group-key="dac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Digital-to-Analog Converter" register-group-key="dac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc7" function="DAC" group="D2A"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc2" function="TC0" group="T0"/>
                 <signal pad-id="pd3" function="TC0" group="OC0A"/>
@@ -272,7 +272,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc3" function="TC1" group="T1"/>
                 <signal pad-id="pd4" function="TC1" group="ICP1A"/>
@@ -282,7 +282,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe2" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pd4" index="1" function="ADC" group="ADC"/>
@@ -298,14 +298,14 @@
             </signals>
         </peripheral>
         <peripheral key="linuart" name="LINUART" module-key="linuart">
-            <register-group-instance key="linuart" name="LINUART" description="Local Interconnect Network" register-group-key="linuart" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Local Interconnect Network" register-group-key="linuart" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" function="LIN" group="TXLIN"/>
                 <signal pad-id="pd4" function="LIN" group="RXLIN"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="SPI" group="MISO"/>
                 <signal pad-id="pd2" function="SPI_ALT" group="MISO"/>
@@ -318,10 +318,10 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="EXINT" group="INT"/>
                 <signal pad-id="pb2" index="1" function="EXINT" group="INT"/>
@@ -357,10 +357,10 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="psc" name="PSC" module-key="psc">
-            <register-group-instance key="psc" name="PSC" description="Power Stage Controller" register-group-key="psc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Power Stage Controller" register-group-key="psc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd2" function="PSC" group="PSCIN2"/>
                 <signal pad-id="pb0" function="PSC" group="PSCOUT2A"/>
@@ -374,10 +374,10 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U2.xml
index f37f7392..0743fa6c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U2.xml
@@ -192,7 +192,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -205,7 +205,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -218,7 +218,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -231,7 +231,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb3" function="default" group="MISO"/>
                 <signal pad-id="pb2" function="default" group="MOSI"/>
@@ -240,13 +240,13 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb7" function="default" group="OCA"/>
                 <signal pad-id="pd0" function="default" group="OCB"/>
@@ -254,7 +254,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc7" function="default" group="ICP"/>
                 <signal pad-id="pc6" function="default" group="OCA"/>
@@ -264,16 +264,16 @@
             </signals>
         </peripheral>
         <peripheral key="pll" name="PLL" module-key="pll">
-            <register-group-instance key="pll" name="PLL" description="Phase Locked Loop" register-group-key="pll" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Phase Locked Loop" register-group-key="pll" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usb_device" name="USB_DEVICE" module-key="usb_device">
-            <register-group-instance key="usb_device" name="USB_DEVICE" description="USB Device Registers" register-group-key="usb_device" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USB Device Registers" register-group-key="usb_device" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="INT"/>
                 <signal pad-id="pd1" index="1" function="default" group="INT"/>
@@ -299,7 +299,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd2" function="default" group="RXD"/>
                 <signal pad-id="pd3" function="default" group="TXD"/>
@@ -309,10 +309,10 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" index="0" function="default" group="AIN"/>
                 <signal pad-id="pd2" index="1" function="default" group="AIN"/>
@@ -324,10 +324,10 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U4.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U4.xml
index ca1e1c02..9a3caaa0 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U4.xml
@@ -192,10 +192,10 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -208,14 +208,14 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc6" index="6" function="default" group="P"/>
                 <signal pad-id="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -228,14 +228,14 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe2" index="2" function="default" group="P"/>
                 <signal pad-id="pe6" index="6" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="P"/>
                 <signal pad-id="pf1" index="1" function="default" group="P"/>
@@ -245,7 +245,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="SS"/>
                 <signal pad-id="pb1" function="default" group="SCK"/>
@@ -256,7 +256,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" function="default" group="TXD"/>
                 <signal pad-id="pd2" function="default" group="RXD"/>
@@ -266,16 +266,16 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe2" function="default" group="HWB"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd7" function="default" group="T"/>
                 <signal pad-id="pd0" function="default" group="OCB"/>
@@ -283,7 +283,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd6" function="default" group="T"/>
                 <signal pad-id="pd4" function="default" group="ICP"/>
@@ -293,14 +293,14 @@
             </signals>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
-            <register-group-instance key="tc3" name="TC3" description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc7" function="default" group="ICP"/>
                 <signal pad-id="pc6" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc4" name="TC4" module-key="tc10">
-            <register-group-instance key="tc4" name="TC4" description="Timer/Counter, 10-bit" register-group-key="tc4" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 10-bit" register-group-key="tc4" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc6" function="default" group="_OCA"/>
                 <signal pad-id="pc7" function="default" group="OCA"/>
@@ -311,7 +311,7 @@
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf4" function="default" group="TCK"/>
                 <signal pad-id="pf5" function="default" group="TMS"/>
@@ -320,7 +320,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="PCINT"/>
                 <signal pad-id="pb1" index="1" function="default" group="PCINT"/>
@@ -338,14 +338,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="SDA"/>
                 <signal pad-id="pd0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pf1" index="1" function="default" group="ADC"/>
@@ -362,28 +362,28 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe6" index="0" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc7" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="pll" name="PLL" module-key="pll">
-            <register-group-instance key="pll" name="PLL" description="Phase Locked Loop" register-group-key="pll" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Phase Locked Loop" register-group-key="pll" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usb_device" name="USB_DEVICE" module-key="usb_device">
-            <register-group-instance key="usb_device" name="USB_DEVICE" description="USB Device Registers" register-group-key="usb_device" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USB Device Registers" register-group-key="usb_device" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA406.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA406.xml
index ead0d094..dfa619a6 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA406.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA406.xml
@@ -92,40 +92,40 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wakeup_timer" name="WAKEUP_TIMER" module-key="wakeup_timer">
-            <register-group-instance key="wakeup_timer" name="WAKEUP_TIMER" description="Wakeup Timer" register-group-key="wakeup_timer" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Wakeup Timer" register-group-key="wakeup_timer" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="battery_protection" name="BATTERY_PROTECTION" module-key="battery_protection">
-            <register-group-instance key="battery_protection" name="BATTERY_PROTECTION" description="Battery Protection" register-group-key="battery_protection" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Battery Protection" register-group-key="battery_protection" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fet" name="FET" module-key="fet">
-            <register-group-instance key="fet" name="FET" description="FET Control" register-group-key="fet" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="FET Control" register-group-key="fet" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="coulomb_counter" name="COULOMB_COUNTER" module-key="coulomb_counter">
-            <register-group-instance key="coulomb_counter" name="COULOMB_COUNTER" description="Coulomb Counter" register-group-key="coulomb_counter" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Coulomb Counter" register-group-key="coulomb_counter" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cell_balancing" name="CELL_BALANCING" module-key="cell_balancing">
-            <register-group-instance key="cell_balancing" name="CELL_BALANCING" description="Cell Balancing" register-group-key="cell_balancing" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Cell Balancing" register-group-key="cell_balancing" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -138,7 +138,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -151,35 +151,35 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="bandgap" name="BANDGAP" module-key="bandgap">
-            <register-group-instance key="bandgap" name="BANDGAP" description="Bandgap" register-group-key="bandgap" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bandgap" register-group-key="bandgap" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48.xml
index 12d9823a..b8a733a9 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48.xml
@@ -196,7 +196,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="TXD"/>
                 <signal pad-id="pd0" function="default" group="RXD"/>
@@ -204,14 +204,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc4" function="default" group="SDA"/>
                 <signal pad-id="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd5" function="default" group="T"/>
                 <signal pad-id="pb0" function="default" group="ICP"/>
@@ -220,14 +220,14 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb3" function="default" group="OCA"/>
                 <signal pad-id="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pc1" index="1" function="default" group="ADC"/>
@@ -238,14 +238,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="default" group="AIN"/>
                 <signal pad-id="pd7" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -258,7 +258,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -270,7 +270,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -283,7 +283,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd4" function="default" group="T"/>
                 <signal pad-id="pd5" function="default" group="OCB"/>
@@ -291,7 +291,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" index="1" function="default" group="INT"/>
                 <signal pad-id="pd3" index="19" function="default" group="PCINT"/>
@@ -321,7 +321,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" function="default" group="SS"/>
                 <signal pad-id="pb3" function="default" group="MOSI"/>
@@ -330,22 +330,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4808.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4808.xml
index 4a7b287b..6da3c0bd 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4808.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4808.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd5" index="1" function="AC0" group="N"/>
@@ -55,7 +55,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
@@ -72,10 +72,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="i2128">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN"/>
@@ -99,7 +99,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2600_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa0" function="CLKCTRL" group="CLKI"/>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKO"/>
@@ -108,16 +108,16 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="i2122">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2600_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -128,19 +128,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2600_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="i2600_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i2600_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="i2109">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -153,7 +153,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -162,7 +162,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
@@ -175,7 +175,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -187,25 +187,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2600_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="i2600_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="i2112">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="i2107">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc1" function="SPI_ALT" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
                 <signal pad-id="pa5" function="SPI" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
@@ -218,10 +218,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2600_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pd0" index="0" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -248,27 +248,27 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA80"/>
             <signals>
                 <signal pad-id="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="i2119">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xA90"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA90"/>
             <signals>
                 <signal pad-id="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="i2119">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xAA0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pf3" function="I2C_ALT2" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
                 <signal pad-id="pc3" function="I2C_ALT" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
@@ -279,7 +279,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -292,7 +292,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="i2108">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -301,7 +301,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="i2108">
-            <register-group-instance key="usart2" name="USART2" register-group-key="usart" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
                 <signal pad-id="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
@@ -313,31 +313,31 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="i2103_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="i2103_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="i2103_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="i2103_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vporte" name="VPORTE" module-key="i2103_vport">
-            <register-group-instance key="vporte" name="VPORTE" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="i2103_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="i2600_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i2127">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4809.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4809.xml
index 5d75edb7..48952e4b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4809.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4809.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd5" index="1" function="AC0" group="N"/>
@@ -55,7 +55,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
@@ -76,10 +76,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="i2128">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN"/>
@@ -104,7 +104,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2600_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa0" function="CLKCTRL" group="CLKI"/>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKO"/>
@@ -113,16 +113,16 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="i2122">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2600_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -136,19 +136,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2600_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="i2600_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i2600_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="i2109">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -161,7 +161,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -172,7 +172,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -185,7 +185,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
@@ -198,7 +198,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pe1" index="1" function="IOPORT" group="PIN"/>
@@ -207,7 +207,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -219,25 +219,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2600_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="i2600_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="i2112">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="i2107">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pe1" function="SPI_ALT2" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
                 <signal pad-id="pc1" function="SPI_ALT" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
@@ -254,10 +254,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2600_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pe0" index="0" function="TCA_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -296,35 +296,35 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA80"/>
             <signals>
                 <signal pad-id="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="i2119">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xA90"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA90"/>
             <signals>
                 <signal pad-id="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="i2119">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xAA0"/>
             <signals>
                 <signal pad-id="pb4" index="0" function="TCB2_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcb3" name="TCB3" module-key="i2119">
-            <register-group-instance key="tcb3" name="TCB3" register-group-key="tcb" address-space-key="data" offset="0xAB0"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xAB0"/>
             <signals>
                 <signal pad-id="pc1" index="0" function="TCB3_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
                 <signal pad-id="pb5" index="0" function="TCB3" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pf3" function="I2C_ALT2" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
                 <signal pad-id="pc3" function="I2C_ALT" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
@@ -335,7 +335,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -348,7 +348,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="i2108">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc5" function="USART1_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -361,7 +361,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="i2108">
-            <register-group-instance key="usart2" name="USART2" register-group-key="usart" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
                 <signal pad-id="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
@@ -373,7 +373,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="i2108">
-            <register-group-instance key="usart3" name="USART3" register-group-key="usart" address-space-key="data" offset="0x860"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x860"/>
             <signals>
                 <signal pad-id="pb5" function="USART3_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
                 <signal pad-id="pb1" function="USART3" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
@@ -384,31 +384,31 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="i2103_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="i2103_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="i2103_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="i2103_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vporte" name="VPORTE" module-key="i2103_vport">
-            <register-group-instance key="vporte" name="VPORTE" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="i2103_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="i2600_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i2127">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48A.xml
index 94131b1d..7df0b2c7 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48A.xml
@@ -196,7 +196,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="TXD"/>
                 <signal pad-id="pd0" function="default" group="RXD"/>
@@ -204,14 +204,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc4" function="default" group="SDA"/>
                 <signal pad-id="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd5" function="default" group="T"/>
                 <signal pad-id="pb0" function="default" group="ICP"/>
@@ -220,14 +220,14 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb3" function="default" group="OCA"/>
                 <signal pad-id="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pc1" index="1" function="default" group="ADC"/>
@@ -238,14 +238,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="default" group="AIN"/>
                 <signal pad-id="pd7" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -258,7 +258,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -270,7 +270,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -283,7 +283,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd4" function="default" group="T"/>
                 <signal pad-id="pd5" function="default" group="OCB"/>
@@ -291,7 +291,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" index="1" function="default" group="INT"/>
                 <signal pad-id="pd3" index="19" function="default" group="PCINT"/>
@@ -321,7 +321,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" function="default" group="SS"/>
                 <signal pad-id="pb3" function="default" group="MOSI"/>
@@ -330,22 +330,22 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48P.xml
index 3ce84bb6..bfea8c31 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48P.xml
@@ -196,7 +196,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="TXD"/>
                 <signal pad-id="pd0" function="default" group="RXD"/>
@@ -204,14 +204,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc4" function="default" group="SDA"/>
                 <signal pad-id="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd5" function="default" group="T"/>
                 <signal pad-id="pb0" function="default" group="ICP"/>
@@ -220,14 +220,14 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb3" function="default" group="OCA"/>
                 <signal pad-id="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pc1" index="1" function="default" group="ADC"/>
@@ -238,14 +238,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="default" group="AIN"/>
                 <signal pad-id="pd7" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -258,7 +258,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -270,7 +270,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -283,7 +283,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd4" function="default" group="T"/>
                 <signal pad-id="pd5" function="default" group="OCB"/>
@@ -291,7 +291,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" index="1" function="default" group="INT"/>
                 <signal pad-id="pd3" index="19" function="default" group="PCINT"/>
@@ -321,7 +321,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" function="default" group="SS"/>
                 <signal pad-id="pb3" function="default" group="MOSI"/>
@@ -330,22 +330,22 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PA.xml
index 88b12466..6db0e9cf 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PA.xml
@@ -196,7 +196,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="TXD"/>
                 <signal pad-id="pd0" function="default" group="RXD"/>
@@ -204,14 +204,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc4" function="default" group="SDA"/>
                 <signal pad-id="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd5" function="default" group="T"/>
                 <signal pad-id="pb0" function="default" group="ICP"/>
@@ -220,14 +220,14 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb3" function="default" group="OCA"/>
                 <signal pad-id="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pc1" index="1" function="default" group="ADC"/>
@@ -238,14 +238,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="default" group="AIN"/>
                 <signal pad-id="pd7" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -258,7 +258,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -270,7 +270,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -283,7 +283,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd4" function="default" group="T"/>
                 <signal pad-id="pd5" function="default" group="OCB"/>
@@ -291,7 +291,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" index="1" function="default" group="INT"/>
                 <signal pad-id="pd3" index="19" function="default" group="PCINT"/>
@@ -321,7 +321,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" function="default" group="SS"/>
                 <signal pad-id="pb3" function="default" group="MOSI"/>
@@ -330,22 +330,22 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PB.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PB.xml
index 4f61c213..617cef70 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PB.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PB.xml
@@ -196,7 +196,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="TXD"/>
                 <signal pad-id="pd0" function="default" group="RXD"/>
@@ -204,14 +204,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc4" function="default" group="SDA"/>
                 <signal pad-id="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd5" function="default" group="T"/>
                 <signal pad-id="pb0" function="default" group="ICP"/>
@@ -220,14 +220,14 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb3" function="default" group="OCA"/>
                 <signal pad-id="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pc1" index="1" function="default" group="ADC"/>
@@ -240,7 +240,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" function="default" group="AC"/>
                 <signal pad-id="pd6" index="0" function="default" group="AIN"/>
@@ -248,7 +248,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -261,7 +261,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -273,7 +273,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -286,7 +286,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="P"/>
                 <signal pad-id="pe1" index="1" function="default" group="P"/>
@@ -295,7 +295,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd4" function="default" group="T"/>
                 <signal pad-id="pd5" function="default" group="OCB"/>
@@ -303,7 +303,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" index="1" function="default" group="INT"/>
                 <signal pad-id="pd3" index="19" function="default" group="PCINT"/>
@@ -333,7 +333,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" function="default" group="SS"/>
                 <signal pad-id="pb3" function="default" group="MOSI"/>
@@ -342,25 +342,25 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="deviceid" name="DEVICEID" module-key="deviceid">
-            <register-group-instance key="deviceid" name="DEVICEID" description="Device ID" register-group-key="deviceid" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Device ID" register-group-key="deviceid" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64.xml
index 37f32d6e..66c31837 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64.xml
@@ -193,14 +193,14 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe3" index="1" function="default" group="AIN"/>
                 <signal pad-id="pe2" index="0" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf7" index="7" function="default" group="ADC"/>
                 <signal pad-id="pf6" index="6" function="default" group="ADC"/>
@@ -213,7 +213,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb3" function="default" group="MISO"/>
                 <signal pad-id="pb2" function="default" group="MOSI"/>
@@ -222,14 +222,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="SDA"/>
                 <signal pad-id="pd0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe2" function="default" group="XCK"/>
                 <signal pad-id="pe1" function="default" group="TXD"/>
@@ -237,7 +237,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd5" function="default" group="XCK"/>
                 <signal pad-id="pd3" function="default" group="TXD"/>
@@ -245,13 +245,13 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf7" function="default" group="TDI"/>
                 <signal pad-id="pf6" function="default" group="TDO"/>
@@ -260,7 +260,7 @@
             </signals>
         </peripheral>
         <peripheral key="misc" name="MISC" module-key="misc">
-            <register-group-instance key="misc" name="MISC" description="Other Registers" register-group-key="misc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Other Registers" register-group-key="misc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa7" index="7" function="default" group="AD"/>
                 <signal pad-id="pa6" index="6" function="default" group="AD"/>
@@ -286,7 +286,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe7" index="7" function="default" group="INT"/>
                 <signal pad-id="pe6" index="6" function="default" group="INT"/>
@@ -299,10 +299,10 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -315,7 +315,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -328,7 +328,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -341,7 +341,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -354,7 +354,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="P"/>
                 <signal pad-id="pe1" index="1" function="default" group="P"/>
@@ -367,7 +367,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="P"/>
                 <signal pad-id="pf1" index="1" function="default" group="P"/>
@@ -380,7 +380,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="default" group="P"/>
                 <signal pad-id="pg1" index="1" function="default" group="P"/>
@@ -390,7 +390,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8_async">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit Async" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb4" function="default" group="OC"/>
                 <signal pad-id="pg4" index="1" function="default" group="TOSC"/>
@@ -398,7 +398,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb7" function="default" group="OCC"/>
                 <signal pad-id="pb6" function="default" group="OCB"/>
@@ -408,7 +408,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
-            <register-group-instance key="tc3" name="TC3" description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe7" function="default" group="ICP"/>
                 <signal pad-id="pe6" function="default" group="T"/>
@@ -418,20 +418,20 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb7" function="default" group="OC"/>
                 <signal pad-id="pd7" function="default" group="T"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA640.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA640.xml
index 7ec5f5d6..65424577 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA640.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA640.xml
@@ -193,14 +193,14 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe1" function="default" group="TXD"/>
                 <signal pad-id="pe0" function="default" group="RXD"/>
@@ -208,7 +208,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" function="default" group="TXD"/>
                 <signal pad-id="pd2" function="default" group="RXD"/>
@@ -216,7 +216,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="usart">
-            <register-group-instance key="usart2" name="USART2" description="USART" register-group-key="usart2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="ph2" function="default" group="XCK"/>
                 <signal pad-id="ph1" function="default" group="TXD"/>
@@ -224,7 +224,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="usart">
-            <register-group-instance key="usart3" name="USART3" description="USART" register-group-key="usart3" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart3" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pj2" function="default" group="XCK"/>
                 <signal pad-id="pj1" function="default" group="TXD"/>
@@ -232,14 +232,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="SDA"/>
                 <signal pad-id="pd0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="SS"/>
                 <signal pad-id="pb2" function="default" group="MOSI"/>
@@ -248,7 +248,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -261,7 +261,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -274,7 +274,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -287,7 +287,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -300,7 +300,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="P"/>
                 <signal pad-id="pe1" index="1" function="default" group="P"/>
@@ -313,7 +313,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="P"/>
                 <signal pad-id="pf1" index="1" function="default" group="P"/>
@@ -326,7 +326,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="default" group="P"/>
                 <signal pad-id="pg1" index="1" function="default" group="P"/>
@@ -339,7 +339,7 @@
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
-            <register-group-instance key="porth" name="PORTH" description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="ph0" index="0" function="default" group="P"/>
                 <signal pad-id="ph1" index="1" function="default" group="P"/>
@@ -352,7 +352,7 @@
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
-            <register-group-instance key="portj" name="PORTJ" description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pj0" index="0" function="default" group="P"/>
                 <signal pad-id="pj1" index="1" function="default" group="P"/>
@@ -365,7 +365,7 @@
             </signals>
         </peripheral>
         <peripheral key="portk" name="PORTK" module-key="gpio_port">
-            <register-group-instance key="portk" name="PORTK" description="I/O Port" register-group-key="portk" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portk" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pk0" index="0" function="default" group="P"/>
                 <signal pad-id="pk1" index="1" function="default" group="P"/>
@@ -378,7 +378,7 @@
             </signals>
         </peripheral>
         <peripheral key="portl" name="PORTL" module-key="gpio_port">
-            <register-group-instance key="portl" name="PORTL" description="I/O Port" register-group-key="portl" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portl" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pl0" index="0" function="default" group="P"/>
                 <signal pad-id="pl1" index="1" function="default" group="P"/>
@@ -391,7 +391,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd7" function="default" group="T"/>
                 <signal pad-id="pg5" function="default" group="OCB"/>
@@ -399,7 +399,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg4" index="1" function="default" group="TOSC"/>
                 <signal pad-id="pg3" index="2" function="default" group="TOSC"/>
@@ -408,13 +408,13 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc5" name="TC5" module-key="tc16">
-            <register-group-instance key="tc5" name="TC5" description="Timer/Counter, 16-bit" register-group-key="tc5" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc5" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pl5" function="default" group="OCC"/>
                 <signal pad-id="pl4" function="default" group="OCB"/>
@@ -424,7 +424,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc4" name="TC4" module-key="tc16">
-            <register-group-instance key="tc4" name="TC4" description="Timer/Counter, 16-bit" register-group-key="tc4" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc4" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="ph7" function="default" group="T"/>
                 <signal pad-id="ph5" function="default" group="OCC"/>
@@ -434,7 +434,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
-            <register-group-instance key="tc3" name="TC3" description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe6" function="default" group="T"/>
                 <signal pad-id="pe7" function="default" group="ICP"/>
@@ -444,7 +444,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd6" function="default" group="T"/>
                 <signal pad-id="pd4" function="default" group="ICP"/>
@@ -454,7 +454,7 @@
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf4" function="default" group="TCK"/>
                 <signal pad-id="pf5" function="default" group="TMS"/>
@@ -463,7 +463,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="PCINT"/>
                 <signal pad-id="pb1" index="1" function="default" group="PCINT"/>
@@ -500,13 +500,13 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe7" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pf1" index="1" function="default" group="ADC"/>
@@ -527,13 +527,13 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644.xml
index 05e6b7f4..5db64cbc 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644.xml
@@ -218,14 +218,14 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pb3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" index="0" function="default" group="TXD"/>
                 <signal pad-id="pd0" index="0" function="default" group="RXD"/>
@@ -233,7 +233,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -246,7 +246,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -259,7 +259,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -272,7 +272,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -285,7 +285,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="T"/>
                 <signal pad-id="pb4" function="default" group="OCB"/>
@@ -294,17 +294,17 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd7" function="default" group="OCA"/>
                 <signal pad-id="pd6" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc2" function="default" group="TCK"/>
                 <signal pad-id="pc3" function="default" group="TMS"/>
@@ -313,10 +313,10 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="PCINT"/>
                 <signal pad-id="pa1" index="1" function="default" group="PCINT"/>
@@ -356,7 +356,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="default" group="ADC"/>
@@ -369,7 +369,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" function="default" group="T"/>
                 <signal pad-id="pd6" function="default" group="ICP"/>
@@ -378,17 +378,17 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc1" function="default" group="SDA"/>
                 <signal pad-id="pc0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb4" function="default" group="SS"/>
                 <signal pad-id="pb5" function="default" group="MOSI"/>
@@ -397,16 +397,16 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644A.xml
index bcb4fe01..c84a26b6 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644A.xml
@@ -218,14 +218,14 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pb3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="TXD"/>
                 <signal pad-id="pd0" function="default" group="RXD"/>
@@ -233,7 +233,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" function="default" group="TXD"/>
                 <signal pad-id="pd2" function="default" group="RXD"/>
@@ -241,7 +241,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -254,7 +254,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -267,7 +267,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -280,7 +280,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -293,7 +293,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="T"/>
                 <signal pad-id="pb4" function="default" group="OCB"/>
@@ -301,7 +301,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc6" index="1" function="default" group="TOSC"/>
                 <signal pad-id="pc7" index="2" function="default" group="TOSC"/>
@@ -310,10 +310,10 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc2" function="default" group="TCK"/>
                 <signal pad-id="pc3" function="default" group="TMS"/>
@@ -322,10 +322,10 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="PCINT"/>
                 <signal pad-id="pa1" index="1" function="default" group="PCINT"/>
@@ -365,7 +365,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="default" group="ADC"/>
@@ -378,7 +378,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" function="default" group="T"/>
                 <signal pad-id="pd6" function="default" group="ICP"/>
@@ -387,17 +387,17 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc1" function="default" group="SDA"/>
                 <signal pad-id="pc0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb4" function="default" group="SS"/>
                 <signal pad-id="pb5" function="default" group="MOSI"/>
@@ -406,16 +406,16 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644P.xml
index 9b40e14a..131cc208 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644P.xml
@@ -218,14 +218,14 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pb3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="TXD"/>
                 <signal pad-id="pd0" function="default" group="RXD"/>
@@ -233,7 +233,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" function="default" group="TXD"/>
                 <signal pad-id="pd2" function="default" group="RXD"/>
@@ -241,7 +241,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -254,7 +254,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -267,7 +267,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -280,7 +280,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -293,7 +293,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="T"/>
                 <signal pad-id="pb4" function="default" group="OCB"/>
@@ -301,7 +301,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc6" index="1" function="default" group="TOSC"/>
                 <signal pad-id="pc7" index="2" function="default" group="TOSC"/>
@@ -310,10 +310,10 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc2" function="default" group="TCK"/>
                 <signal pad-id="pc3" function="default" group="TMS"/>
@@ -322,10 +322,10 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="PCINT"/>
                 <signal pad-id="pa1" index="1" function="default" group="PCINT"/>
@@ -365,7 +365,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="default" group="ADC"/>
@@ -378,7 +378,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" function="default" group="T"/>
                 <signal pad-id="pd6" function="default" group="ICP"/>
@@ -387,23 +387,23 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc1" function="default" group="SDA"/>
                 <signal pad-id="pc0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb4" function="default" group="SS"/>
                 <signal pad-id="pb5" function="default" group="MOSI"/>
@@ -412,10 +412,10 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644PA.xml
index 1da11b30..b30b91a5 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644PA.xml
@@ -218,14 +218,14 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pb3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="TXD"/>
                 <signal pad-id="pd0" function="default" group="RXD"/>
@@ -233,7 +233,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" function="default" group="TXD"/>
                 <signal pad-id="pd2" function="default" group="RXD"/>
@@ -241,7 +241,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -254,7 +254,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -267,7 +267,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -280,7 +280,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -293,7 +293,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="T"/>
                 <signal pad-id="pb4" function="default" group="OCB"/>
@@ -301,17 +301,17 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd7" function="default" group="OCA"/>
                 <signal pad-id="pd6" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc2" function="default" group="TCK"/>
                 <signal pad-id="pc3" function="default" group="TMS"/>
@@ -320,10 +320,10 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="PCINT"/>
                 <signal pad-id="pa1" index="1" function="default" group="PCINT"/>
@@ -363,7 +363,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="default" group="ADC"/>
@@ -376,7 +376,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" function="default" group="T"/>
                 <signal pad-id="pd6" function="default" group="ICP"/>
@@ -385,23 +385,23 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc1" function="default" group="SDA"/>
                 <signal pad-id="pc0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb4" function="default" group="SS"/>
                 <signal pad-id="pb5" function="default" group="MOSI"/>
@@ -410,10 +410,10 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644RFR2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644RFR2.xml
index 5eb91232..7d807902 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644RFR2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644RFR2.xml
@@ -195,28 +195,28 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0_spi" name="USART0_SPI" module-key="spi">
-            <register-group-instance key="usart0_spi" name="USART0_SPI" description="Serial Peripheral Interface" register-group-key="usart0_spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="usart0_spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart1_spi" name="USART1_SPI" module-key="spi">
-            <register-group-instance key="usart1_spi" name="USART1_SPI" description="Serial Peripheral Interface" register-group-key="usart1_spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="usart1_spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -229,7 +229,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -242,7 +242,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -254,7 +254,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -267,7 +267,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
                 <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
@@ -275,61 +275,61 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc5" name="TC5" module-key="tc16">
-            <register-group-instance key="tc5" name="TC5" description="Timer/Counter, 16-bit" register-group-key="tc5" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc5" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc4" name="TC4" module-key="tc16">
-            <register-group-instance key="tc4" name="TC4" description="Timer/Counter, 16-bit" register-group-key="tc4" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc4" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
-            <register-group-instance key="tc3" name="TC3" description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="trx24" name="TRX24" module-key="trx24">
-            <register-group-instance key="trx24" name="TRX24" description="Low-Power 2.4 GHz Transceiver" register-group-key="trx24" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Low-Power 2.4 GHz Transceiver" register-group-key="trx24" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="symcnt" name="SYMCNT" module-key="symcnt">
-            <register-group-instance key="symcnt" name="SYMCNT" description="MAC Symbol Counter" register-group-key="symcnt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="MAC Symbol Counter" register-group-key="symcnt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="flash" name="FLASH" module-key="flash">
-            <register-group-instance key="flash" name="FLASH" description="FLASH Controller" register-group-key="flash" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="FLASH Controller" register-group-key="flash" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="pwrctrl" name="PWRCTRL" module-key="pwrctrl">
-            <register-group-instance key="pwrctrl" name="PWRCTRL" description="Power Controller" register-group-key="pwrctrl" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Power Controller" register-group-key="pwrctrl" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645.xml
index ba23b3f2..d8175345 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645.xml
@@ -192,31 +192,31 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -229,7 +229,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -242,7 +242,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -255,7 +255,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -268,7 +268,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -281,7 +281,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -294,7 +294,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="PORTG" group="P"/>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
@@ -305,28 +305,28 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450.xml
index a5f8d6ea..9d39397c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450.xml
@@ -192,31 +192,31 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -229,7 +229,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -242,7 +242,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -255,7 +255,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -268,7 +268,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -281,7 +281,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -294,7 +294,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="PORTG" group="P"/>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
@@ -305,7 +305,7 @@
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
-            <register-group-instance key="porth" name="PORTH" description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="ph0" index="0" function="PORTH" group="P"/>
                 <signal pad-id="ph1" index="1" function="PORTH" group="P"/>
@@ -318,7 +318,7 @@
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
-            <register-group-instance key="portj" name="PORTJ" description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pj0" index="0" function="PORTJ" group="P"/>
                 <signal pad-id="pj1" index="1" function="PORTJ" group="P"/>
@@ -330,28 +330,28 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450A.xml
index 4978e4a1..44d9bbd7 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450A.xml
@@ -192,31 +192,31 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -229,7 +229,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -242,7 +242,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -255,7 +255,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -268,7 +268,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -281,7 +281,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -294,7 +294,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="PORTG" group="P"/>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
@@ -305,7 +305,7 @@
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
-            <register-group-instance key="porth" name="PORTH" description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="ph0" index="0" function="PORTH" group="P"/>
                 <signal pad-id="ph1" index="1" function="PORTH" group="P"/>
@@ -318,7 +318,7 @@
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
-            <register-group-instance key="portj" name="PORTJ" description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pj0" index="0" function="PORTJ" group="P"/>
                 <signal pad-id="pj1" index="1" function="PORTJ" group="P"/>
@@ -330,28 +330,28 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450P.xml
index c15023fa..6771593a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450P.xml
@@ -192,31 +192,31 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -229,7 +229,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -242,7 +242,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -255,7 +255,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -268,7 +268,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -281,7 +281,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -294,7 +294,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="PORTG" group="P"/>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
@@ -305,7 +305,7 @@
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
-            <register-group-instance key="porth" name="PORTH" description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="ph0" index="0" function="PORTH" group="P"/>
                 <signal pad-id="ph1" index="1" function="PORTH" group="P"/>
@@ -318,7 +318,7 @@
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
-            <register-group-instance key="portj" name="PORTJ" description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pj0" index="0" function="PORTJ" group="P"/>
                 <signal pad-id="pj1" index="1" function="PORTJ" group="P"/>
@@ -330,28 +330,28 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645A.xml
index 273f3665..433bcb7f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645A.xml
@@ -192,31 +192,31 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -229,7 +229,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -242,7 +242,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -255,7 +255,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -268,7 +268,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -281,7 +281,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -294,7 +294,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="PORTG" group="P"/>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
@@ -305,28 +305,28 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645P.xml
index 786916ec..de7d1537 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645P.xml
@@ -192,31 +192,31 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -229,7 +229,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -242,7 +242,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -255,7 +255,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -268,7 +268,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -281,7 +281,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -294,7 +294,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="PORTG" group="P"/>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
@@ -305,28 +305,28 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649.xml
index 3944d46a..19d05eb1 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649.xml
@@ -192,14 +192,14 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg4" function="default" group="T"/>
                 <signal pad-id="pb4" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg3" function="default" group="T"/>
                 <signal pad-id="pd0" function="default" group="ICP"/>
@@ -209,20 +209,20 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb7" function="default" group="OCA"/>
                 <signal pad-id="xtal2" function="default" group="TOSC"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="SS"/>
                 <signal pad-id="pb1" function="default" group="SCK"/>
@@ -231,7 +231,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -244,7 +244,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -257,7 +257,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -270,7 +270,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -283,7 +283,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="P"/>
                 <signal pad-id="pe1" index="1" function="default" group="P"/>
@@ -296,7 +296,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="P"/>
                 <signal pad-id="pf1" index="1" function="default" group="P"/>
@@ -309,7 +309,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="default" group="P"/>
                 <signal pad-id="pg1" index="1" function="default" group="P"/>
@@ -320,14 +320,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf4" function="default" group="TCK"/>
                 <signal pad-id="pf5" function="default" group="TMS"/>
@@ -336,7 +336,7 @@
             </signals>
         </peripheral>
         <peripheral key="lcd" name="LCD" module-key="lcd">
-            <register-group-instance key="lcd" name="LCD" description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa4" index="0" function="default" group="SEG"/>
                 <signal pad-id="pa5" index="1" function="default" group="SEG"/>
@@ -370,7 +370,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="PCINT"/>
                 <signal pad-id="pe1" index="1" function="default" group="PCINT"/>
@@ -392,20 +392,20 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe7" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe5" function="default" group="DI"/>
                 <signal pad-id="pe6" function="default" group="DO"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pf1" index="1" function="default" group="ADC"/>
@@ -418,10 +418,10 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" function="default" group="RXD"/>
                 <signal pad-id="pe1" function="default" group="TXD"/>
@@ -430,10 +430,10 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490.xml
index 376483e5..ce217e35 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490.xml
@@ -192,31 +192,31 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -229,7 +229,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -242,7 +242,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -255,7 +255,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -268,7 +268,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -281,7 +281,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -294,7 +294,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="PORTG" group="P"/>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
@@ -305,7 +305,7 @@
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
-            <register-group-instance key="porth" name="PORTH" description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="ph0" index="0" function="PORTH" group="P"/>
                 <signal pad-id="ph1" index="1" function="PORTH" group="P"/>
@@ -318,7 +318,7 @@
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
-            <register-group-instance key="portj" name="PORTJ" description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pj0" index="0" function="PORTJ" group="P"/>
                 <signal pad-id="pj1" index="1" function="PORTJ" group="P"/>
@@ -330,31 +330,31 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="lcd" name="LCD" module-key="lcd">
-            <register-group-instance key="lcd" name="LCD" description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490A.xml
index 842a6e2b..60ee869c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490A.xml
@@ -192,31 +192,31 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -229,7 +229,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -242,7 +242,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -255,7 +255,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -268,7 +268,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -281,7 +281,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -294,7 +294,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="PORTG" group="P"/>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
@@ -305,7 +305,7 @@
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
-            <register-group-instance key="porth" name="PORTH" description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="ph0" index="0" function="PORTH" group="P"/>
                 <signal pad-id="ph1" index="1" function="PORTH" group="P"/>
@@ -318,7 +318,7 @@
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
-            <register-group-instance key="portj" name="PORTJ" description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pj0" index="0" function="PORTJ" group="P"/>
                 <signal pad-id="pj1" index="1" function="PORTJ" group="P"/>
@@ -330,31 +330,31 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="lcd" name="LCD" module-key="lcd">
-            <register-group-instance key="lcd" name="LCD" description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490P.xml
index e99f519a..a0b84eac 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490P.xml
@@ -192,31 +192,31 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -229,7 +229,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -242,7 +242,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -255,7 +255,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -268,7 +268,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -281,7 +281,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -294,7 +294,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="PORTG" group="P"/>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
@@ -305,7 +305,7 @@
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
-            <register-group-instance key="porth" name="PORTH" description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porth" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="ph0" index="0" function="PORTH" group="P"/>
                 <signal pad-id="ph1" index="1" function="PORTH" group="P"/>
@@ -318,7 +318,7 @@
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
-            <register-group-instance key="portj" name="PORTJ" description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portj" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pj0" index="0" function="PORTJ" group="P"/>
                 <signal pad-id="pj1" index="1" function="PORTJ" group="P"/>
@@ -330,31 +330,31 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="lcd" name="LCD" module-key="lcd">
-            <register-group-instance key="lcd" name="LCD" description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649A.xml
index 8b947cfd..fb48b0b9 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649A.xml
@@ -192,14 +192,14 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg4" function="default" group="T"/>
                 <signal pad-id="pb4" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg3" function="default" group="T"/>
                 <signal pad-id="pd0" function="default" group="ICP"/>
@@ -209,20 +209,20 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb7" function="default" group="OCA"/>
                 <signal pad-id="xtal2" function="default" group="TOSC"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="SS"/>
                 <signal pad-id="pb1" function="default" group="SCK"/>
@@ -231,7 +231,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -244,7 +244,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -257,7 +257,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -270,7 +270,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -283,7 +283,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="P"/>
                 <signal pad-id="pe1" index="1" function="default" group="P"/>
@@ -296,7 +296,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="P"/>
                 <signal pad-id="pf1" index="1" function="default" group="P"/>
@@ -309,7 +309,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="default" group="P"/>
                 <signal pad-id="pg1" index="1" function="default" group="P"/>
@@ -320,14 +320,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf4" function="default" group="TCK"/>
                 <signal pad-id="pf5" function="default" group="TMS"/>
@@ -336,7 +336,7 @@
             </signals>
         </peripheral>
         <peripheral key="lcd" name="LCD" module-key="lcd">
-            <register-group-instance key="lcd" name="LCD" description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa4" index="0" function="default" group="SEG"/>
                 <signal pad-id="pa5" index="1" function="default" group="SEG"/>
@@ -370,7 +370,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="PCINT"/>
                 <signal pad-id="pe1" index="1" function="default" group="PCINT"/>
@@ -392,20 +392,20 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe7" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe5" function="default" group="DI"/>
                 <signal pad-id="pe6" function="default" group="DO"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pf1" index="1" function="default" group="ADC"/>
@@ -418,10 +418,10 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" function="default" group="RXD"/>
                 <signal pad-id="pe1" function="default" group="TXD"/>
@@ -430,10 +430,10 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649P.xml
index a85963cf..c8c4222b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649P.xml
@@ -192,14 +192,14 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg4" function="default" group="T"/>
                 <signal pad-id="pb4" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg3" function="default" group="T"/>
                 <signal pad-id="pd0" function="default" group="ICP"/>
@@ -209,20 +209,20 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb7" function="default" group="OCA"/>
                 <signal pad-id="xtal2" function="default" group="TOSC"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="default" group="SS"/>
                 <signal pad-id="pb1" function="default" group="SCK"/>
@@ -231,7 +231,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -244,7 +244,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -257,7 +257,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -270,7 +270,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -283,7 +283,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="P"/>
                 <signal pad-id="pe1" index="1" function="default" group="P"/>
@@ -296,7 +296,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="P"/>
                 <signal pad-id="pf1" index="1" function="default" group="P"/>
@@ -309,7 +309,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="default" group="P"/>
                 <signal pad-id="pg1" index="1" function="default" group="P"/>
@@ -320,14 +320,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf4" function="default" group="TCK"/>
                 <signal pad-id="pf5" function="default" group="TMS"/>
@@ -336,7 +336,7 @@
             </signals>
         </peripheral>
         <peripheral key="lcd" name="LCD" module-key="lcd">
-            <register-group-instance key="lcd" name="LCD" description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Liquid Crystal Display" register-group-key="lcd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa4" index="0" function="default" group="SEG"/>
                 <signal pad-id="pa5" index="1" function="default" group="SEG"/>
@@ -370,7 +370,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="PCINT"/>
                 <signal pad-id="pe1" index="1" function="default" group="PCINT"/>
@@ -392,20 +392,20 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe7" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe5" function="default" group="DI"/>
                 <signal pad-id="pe6" function="default" group="DO"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pf1" index="1" function="default" group="ADC"/>
@@ -418,10 +418,10 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" function="default" group="RXD"/>
                 <signal pad-id="pe1" function="default" group="TXD"/>
@@ -430,10 +430,10 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64A.xml
index beefcf68..61481ab6 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64A.xml
@@ -193,14 +193,14 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe2" index="0" function="default" group="AIN"/>
                 <signal pad-id="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pf1" index="1" function="default" group="ADC"/>
@@ -213,7 +213,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb3" function="default" group="MISO"/>
                 <signal pad-id="pb2" function="default" group="MOSI"/>
@@ -222,14 +222,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="SDA"/>
                 <signal pad-id="pd0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" function="default" group="RXD"/>
                 <signal pad-id="pe1" function="default" group="TXD"/>
@@ -237,7 +237,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd2" function="default" group="RXD"/>
                 <signal pad-id="pd3" function="default" group="TXD"/>
@@ -245,13 +245,13 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf4" function="default" group="TCK"/>
                 <signal pad-id="pf5" function="default" group="TMS"/>
@@ -260,7 +260,7 @@
             </signals>
         </peripheral>
         <peripheral key="misc" name="MISC" module-key="misc">
-            <register-group-instance key="misc" name="MISC" description="Other Registers" register-group-key="misc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Other Registers" register-group-key="misc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" function="default" group="PDI"/>
                 <signal pad-id="pe1" function="default" group="PDO"/>
@@ -289,7 +289,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="INT"/>
                 <signal pad-id="pd1" index="1" function="default" group="INT"/>
@@ -302,10 +302,10 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -318,7 +318,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -331,7 +331,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -344,7 +344,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -357,7 +357,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="P"/>
                 <signal pad-id="pe1" index="1" function="default" group="P"/>
@@ -370,7 +370,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="default" group="P"/>
                 <signal pad-id="pf1" index="1" function="default" group="P"/>
@@ -383,7 +383,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="default" group="P"/>
                 <signal pad-id="pg1" index="1" function="default" group="P"/>
@@ -393,13 +393,13 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8_async">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit Async" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb4" function="default" group="OC"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb5" function="default" group="OCA"/>
                 <signal pad-id="pb6" function="default" group="OCB"/>
@@ -409,7 +409,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
-            <register-group-instance key="tc3" name="TC3" description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe3" function="default" group="OCA"/>
                 <signal pad-id="pe4" function="default" group="OCB"/>
@@ -418,20 +418,20 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd7" function="default" group="T"/>
                 <signal pad-id="pb7" function="default" group="OC"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64C1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64C1.xml
index 5cb4ed71..ac8b86a3 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64C1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64C1.xml
@@ -192,7 +192,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -205,7 +205,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -218,7 +218,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
@@ -231,7 +231,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pe1" index="1" function="IOPORT" group="PIN"/>
@@ -239,10 +239,10 @@
             </signals>
         </peripheral>
         <peripheral key="can" name="CAN" module-key="can">
-            <register-group-instance key="can" name="CAN" description="Controller Area Network" register-group-key="can" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Controller Area Network" register-group-key="can" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd7" index="0" function="AC" group="ACMP"/>
                 <signal pad-id="pc6" index="1" function="AC" group="ACMP"/>
@@ -255,16 +255,16 @@
             </signals>
         </peripheral>
         <peripheral key="dac" name="DAC" module-key="dac">
-            <register-group-instance key="dac" name="DAC" description="Digital-to-Analog Converter" register-group-key="dac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Digital-to-Analog Converter" register-group-key="dac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc7" function="DAC" group="D2A"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc2" function="TC0" group="T0"/>
                 <signal pad-id="pd3" function="TC0" group="OC0A"/>
@@ -272,7 +272,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc3" function="TC1" group="T1"/>
                 <signal pad-id="pd4" function="TC1" group="ICP1A"/>
@@ -282,7 +282,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe2" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pd4" index="1" function="ADC" group="ADC"/>
@@ -298,14 +298,14 @@
             </signals>
         </peripheral>
         <peripheral key="linuart" name="LINUART" module-key="linuart">
-            <register-group-instance key="linuart" name="LINUART" description="Local Interconnect Network" register-group-key="linuart" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Local Interconnect Network" register-group-key="linuart" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" function="LIN" group="TXLIN"/>
                 <signal pad-id="pd4" function="LIN" group="RXLIN"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="SPI" group="MISO"/>
                 <signal pad-id="pd2" function="SPI_ALT" group="MISO"/>
@@ -318,10 +318,10 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="EXINT" group="INT"/>
                 <signal pad-id="pb2" index="1" function="EXINT" group="INT"/>
@@ -357,13 +357,13 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64M1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64M1.xml
index f37e83d6..90f4c7fd 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64M1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64M1.xml
@@ -192,7 +192,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -205,7 +205,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -218,7 +218,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
@@ -231,7 +231,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pe1" index="1" function="IOPORT" group="PIN"/>
@@ -239,10 +239,10 @@
             </signals>
         </peripheral>
         <peripheral key="can" name="CAN" module-key="can">
-            <register-group-instance key="can" name="CAN" description="Controller Area Network" register-group-key="can" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Controller Area Network" register-group-key="can" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd7" index="0" function="AC" group="ACMP"/>
                 <signal pad-id="pc6" index="1" function="AC" group="ACMP"/>
@@ -255,16 +255,16 @@
             </signals>
         </peripheral>
         <peripheral key="dac" name="DAC" module-key="dac">
-            <register-group-instance key="dac" name="DAC" description="Digital-to-Analog Converter" register-group-key="dac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Digital-to-Analog Converter" register-group-key="dac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc7" function="DAC" group="D2A"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc2" function="TC0" group="T0"/>
                 <signal pad-id="pd3" function="TC0" group="OC0A"/>
@@ -272,7 +272,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc3" function="TC1" group="T1"/>
                 <signal pad-id="pd4" function="TC1" group="ICP1A"/>
@@ -282,7 +282,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe2" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pd4" index="1" function="ADC" group="ADC"/>
@@ -298,14 +298,14 @@
             </signals>
         </peripheral>
         <peripheral key="linuart" name="LINUART" module-key="linuart">
-            <register-group-instance key="linuart" name="LINUART" description="Local Interconnect Network" register-group-key="linuart" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Local Interconnect Network" register-group-key="linuart" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" function="LIN" group="TXLIN"/>
                 <signal pad-id="pd4" function="LIN" group="RXLIN"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="SPI" group="MISO"/>
                 <signal pad-id="pd2" function="SPI_ALT" group="MISO"/>
@@ -318,10 +318,10 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="EXINT" group="INT"/>
                 <signal pad-id="pb2" index="1" function="EXINT" group="INT"/>
@@ -357,10 +357,10 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="psc" name="PSC" module-key="psc">
-            <register-group-instance key="psc" name="PSC" description="Power Stage Controller" register-group-key="psc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Power Stage Controller" register-group-key="psc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd2" function="PSC" group="PSCIN2"/>
                 <signal pad-id="pb0" function="PSC" group="PSCOUT2A"/>
@@ -374,10 +374,10 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64RFR2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64RFR2.xml
index 963c5e71..c4ec097b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64RFR2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64RFR2.xml
@@ -195,28 +195,28 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0_spi" name="USART0_SPI" module-key="spi">
-            <register-group-instance key="usart0_spi" name="USART0_SPI" description="Serial Peripheral Interface" register-group-key="usart0_spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="usart0_spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart1_spi" name="USART1_SPI" module-key="spi">
-            <register-group-instance key="usart1_spi" name="USART1_SPI" description="Serial Peripheral Interface" register-group-key="usart1_spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="usart1_spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -229,7 +229,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -242,7 +242,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -255,7 +255,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portf" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -268,7 +268,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portg" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="PORTG" group="P"/>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
@@ -279,61 +279,61 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc5" name="TC5" module-key="tc16">
-            <register-group-instance key="tc5" name="TC5" description="Timer/Counter, 16-bit" register-group-key="tc5" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc5" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc4" name="TC4" module-key="tc16">
-            <register-group-instance key="tc4" name="TC4" description="Timer/Counter, 16-bit" register-group-key="tc4" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc4" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
-            <register-group-instance key="tc3" name="TC3" description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc3" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="trx24" name="TRX24" module-key="trx24">
-            <register-group-instance key="trx24" name="TRX24" description="Low-Power 2.4 GHz Transceiver" register-group-key="trx24" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Low-Power 2.4 GHz Transceiver" register-group-key="trx24" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="symcnt" name="SYMCNT" module-key="symcnt">
-            <register-group-instance key="symcnt" name="SYMCNT" description="MAC Symbol Counter" register-group-key="symcnt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="MAC Symbol Counter" register-group-key="symcnt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
-            <register-group-instance key="jtag" name="JTAG" description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="JTAG Interface" register-group-key="jtag" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="flash" name="FLASH" module-key="flash">
-            <register-group-instance key="flash" name="FLASH" description="FLASH Controller" register-group-key="flash" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="FLASH Controller" register-group-key="flash" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="pwrctrl" name="PWRCTRL" module-key="pwrctrl">
-            <register-group-instance key="pwrctrl" name="PWRCTRL" description="Power Controller" register-group-key="pwrctrl" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Power Controller" register-group-key="pwrctrl" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA808.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA808.xml
index 4ba50107..66f1dfd3 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA808.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA808.xml
@@ -43,7 +43,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd5" index="1" function="AC0" group="N"/>
@@ -56,7 +56,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
@@ -73,10 +73,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="i2128">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
@@ -100,7 +100,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2113">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa0" function="CLKCTRL" group="CLKI"/>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKO"/>
@@ -109,16 +109,16 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="i2122">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2118">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT0"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT0"/>
@@ -129,19 +129,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2600_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="i2600_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i2600_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="i2109">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -154,7 +154,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -163,7 +163,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
@@ -176,7 +176,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -188,25 +188,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2600_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="i2600_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="i2112">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="i2107">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc1" function="SPI_ALT" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
                 <signal pad-id="pa5" function="SPI" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
@@ -219,10 +219,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2600_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pd0" index="0" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -249,27 +249,27 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA80"/>
             <signals>
                 <signal pad-id="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="i2119">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xA90"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA90"/>
             <signals>
                 <signal pad-id="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="i2119">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xAA0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pf3" function="I2C_ALT2" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
                 <signal pad-id="pc3" function="I2C_ALT" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
@@ -280,7 +280,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -293,7 +293,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="i2108">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -302,7 +302,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="i2108">
-            <register-group-instance key="usart2" name="USART2" register-group-key="usart" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
                 <signal pad-id="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
@@ -314,31 +314,31 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="i2103_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="i2103_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="i2103_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="i2103_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vporte" name="VPORTE" module-key="i2103_vport">
-            <register-group-instance key="vporte" name="VPORTE" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="i2103_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="i2600_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i2127">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA809.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA809.xml
index fb42f5c7..99139282 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA809.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA809.xml
@@ -43,7 +43,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pd3" index="0" function="AC0" group="N"/>
                 <signal pad-id="pd5" index="1" function="AC0" group="N"/>
@@ -56,7 +56,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pd1" index="1" function="AIN0" group="AIN"/>
@@ -77,10 +77,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="i2128">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
@@ -105,7 +105,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2113">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa0" function="CLKCTRL" group="CLKI"/>
                 <signal pad-id="pa7" function="CLKCTRL" group="CLKO"/>
@@ -114,16 +114,16 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="i2122">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2118">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT0"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT0"/>
@@ -137,19 +137,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2600_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="i2600_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i2600_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="i2109">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -162,7 +162,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -173,7 +173,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -186,7 +186,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pd1" index="1" function="IOPORT" group="PIN"/>
@@ -199,7 +199,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pe1" index="1" function="IOPORT" group="PIN"/>
@@ -208,7 +208,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pf1" index="1" function="IOPORT" group="PIN"/>
@@ -220,25 +220,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2600_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="i2600_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="i2112">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="i2107">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pe1" function="SPI_ALT2" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
                 <signal pad-id="pc1" function="SPI_ALT" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
@@ -255,10 +255,10 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2600_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pe0" index="0" function="TCA_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -297,35 +297,35 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA80"/>
             <signals>
                 <signal pad-id="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
                 <signal pad-id="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="i2119">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xA90"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA90"/>
             <signals>
                 <signal pad-id="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="i2119">
-            <register-group-instance key="tcb2" name="TCB2" register-group-key="tcb" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xAA0"/>
             <signals>
                 <signal pad-id="pb4" index="0" function="TCB2_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
                 <signal pad-id="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcb3" name="TCB3" module-key="i2119">
-            <register-group-instance key="tcb3" name="TCB3" register-group-key="tcb" address-space-key="data" offset="0xAB0"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xAB0"/>
             <signals>
                 <signal pad-id="pc1" index="0" function="TCB3_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
                 <signal pad-id="pb5" index="0" function="TCB3" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pf3" function="I2C_ALT2" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
                 <signal pad-id="pc3" function="I2C_ALT" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
@@ -336,7 +336,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -349,7 +349,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="i2108">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc5" function="USART1_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -362,7 +362,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="i2108">
-            <register-group-instance key="usart2" name="USART2" register-group-key="usart" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
                 <signal pad-id="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
@@ -374,7 +374,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="i2108">
-            <register-group-instance key="usart3" name="USART3" register-group-key="usart" address-space-key="data" offset="0x860"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x860"/>
             <signals>
                 <signal pad-id="pb5" function="USART3_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
                 <signal pad-id="pb1" function="USART3" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
@@ -385,31 +385,31 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="i2103_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="i2103_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="i2103_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vportd" name="VPORTD" module-key="i2103_vport">
-            <register-group-instance key="vportd" name="VPORTD" register-group-key="vport" address-space-key="data" offset="0xC"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0xC"/>
         </peripheral>
         <peripheral key="vporte" name="VPORTE" module-key="i2103_vport">
-            <register-group-instance key="vporte" name="VPORTE" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vportf" name="VPORTF" module-key="i2103_vport">
-            <register-group-instance key="vportf" name="VPORTF" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="i2600_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i2127">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88.xml
index 1686249a..0d4735a0 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88.xml
@@ -218,7 +218,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="TXD"/>
                 <signal pad-id="pd0" function="default" group="RXD"/>
@@ -226,14 +226,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc4" function="default" group="SDA"/>
                 <signal pad-id="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd5" function="default" group="T"/>
                 <signal pad-id="pb0" function="default" group="ICP"/>
@@ -242,14 +242,14 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb3" function="default" group="OCA"/>
                 <signal pad-id="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pc1" index="1" function="default" group="ADC"/>
@@ -260,14 +260,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="default" group="AIN"/>
                 <signal pad-id="pd7" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -280,7 +280,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -292,7 +292,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -305,7 +305,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd4" function="default" group="T"/>
                 <signal pad-id="pd5" function="default" group="OCB"/>
@@ -313,7 +313,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" index="1" function="default" group="INT"/>
                 <signal pad-id="pd3" index="19" function="default" group="PCINT"/>
@@ -343,7 +343,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" function="default" group="SS"/>
                 <signal pad-id="pb3" function="default" group="MOSI"/>
@@ -352,22 +352,22 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88A.xml
index 74000b1e..d1c0f71c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88A.xml
@@ -218,7 +218,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="TXD"/>
                 <signal pad-id="pd0" function="default" group="RXD"/>
@@ -226,14 +226,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc4" function="default" group="SDA"/>
                 <signal pad-id="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd5" function="default" group="T"/>
                 <signal pad-id="pb0" function="default" group="ICP"/>
@@ -242,14 +242,14 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb3" function="default" group="OCA"/>
                 <signal pad-id="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pc1" index="1" function="default" group="ADC"/>
@@ -260,14 +260,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="default" group="AIN"/>
                 <signal pad-id="pd7" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -280,7 +280,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -292,7 +292,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -305,7 +305,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd4" function="default" group="T"/>
                 <signal pad-id="pd5" function="default" group="OCB"/>
@@ -313,7 +313,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" index="1" function="default" group="INT"/>
                 <signal pad-id="pd3" index="19" function="default" group="PCINT"/>
@@ -343,7 +343,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" function="default" group="SS"/>
                 <signal pad-id="pb3" function="default" group="MOSI"/>
@@ -352,22 +352,22 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88P.xml
index 7fd8cc80..25c14af5 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88P.xml
@@ -218,7 +218,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="TXD"/>
                 <signal pad-id="pd0" function="default" group="RXD"/>
@@ -226,14 +226,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc4" function="default" group="SDA"/>
                 <signal pad-id="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd5" function="default" group="T"/>
                 <signal pad-id="pb0" function="default" group="ICP"/>
@@ -242,14 +242,14 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb3" function="default" group="OCA"/>
                 <signal pad-id="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pc1" index="1" function="default" group="ADC"/>
@@ -260,14 +260,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="default" group="AIN"/>
                 <signal pad-id="pd7" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -280,7 +280,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -292,7 +292,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -305,7 +305,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd4" function="default" group="T"/>
                 <signal pad-id="pd5" function="default" group="OCB"/>
@@ -313,7 +313,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" index="1" function="default" group="INT"/>
                 <signal pad-id="pd3" index="19" function="default" group="PCINT"/>
@@ -343,7 +343,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" function="default" group="SS"/>
                 <signal pad-id="pb3" function="default" group="MOSI"/>
@@ -352,22 +352,22 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PA.xml
index e6d0807c..445087cc 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PA.xml
@@ -218,7 +218,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="TXD"/>
                 <signal pad-id="pd0" function="default" group="RXD"/>
@@ -226,14 +226,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc4" function="default" group="SDA"/>
                 <signal pad-id="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd5" function="default" group="T"/>
                 <signal pad-id="pb0" function="default" group="ICP"/>
@@ -242,14 +242,14 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb3" function="default" group="OCA"/>
                 <signal pad-id="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pc1" index="1" function="default" group="ADC"/>
@@ -260,14 +260,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd6" index="0" function="default" group="AIN"/>
                 <signal pad-id="pd7" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -280,7 +280,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -292,7 +292,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -305,7 +305,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd4" function="default" group="T"/>
                 <signal pad-id="pd5" function="default" group="OCB"/>
@@ -313,7 +313,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" index="1" function="default" group="INT"/>
                 <signal pad-id="pd3" index="19" function="default" group="PCINT"/>
@@ -343,7 +343,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" function="default" group="SS"/>
                 <signal pad-id="pb3" function="default" group="MOSI"/>
@@ -352,22 +352,22 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PB.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PB.xml
index e1c748ad..727a6629 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PB.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PB.xml
@@ -218,7 +218,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" function="default" group="TXD"/>
                 <signal pad-id="pd0" function="default" group="RXD"/>
@@ -226,14 +226,14 @@
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc4" function="default" group="SDA"/>
                 <signal pad-id="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd5" function="default" group="T"/>
                 <signal pad-id="pb0" function="default" group="ICP"/>
@@ -242,14 +242,14 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb3" function="default" group="OCA"/>
                 <signal pad-id="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pc1" index="1" function="default" group="ADC"/>
@@ -262,7 +262,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" function="default" group="AC"/>
                 <signal pad-id="pd6" index="0" function="default" group="AIN"/>
@@ -270,7 +270,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -283,7 +283,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -295,7 +295,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -308,7 +308,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porte" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="default" group="P"/>
                 <signal pad-id="pe1" index="1" function="default" group="P"/>
@@ -317,7 +317,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd4" function="default" group="T"/>
                 <signal pad-id="pd5" function="default" group="OCB"/>
@@ -325,7 +325,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd3" index="1" function="default" group="INT"/>
                 <signal pad-id="pd3" index="19" function="default" group="PCINT"/>
@@ -355,7 +355,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" function="default" group="SS"/>
                 <signal pad-id="pb3" function="default" group="MOSI"/>
@@ -364,25 +364,25 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="deviceid" name="DEVICEID" module-key="deviceid">
-            <register-group-instance key="deviceid" name="DEVICEID" description="Device ID" register-group-key="deviceid" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Device ID" register-group-key="deviceid" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA8U2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA8U2.xml
index 8297e4c5..d98fcaf1 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA8U2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA8U2.xml
@@ -192,7 +192,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -205,7 +205,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -218,7 +218,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -231,7 +231,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb3" function="default" group="MISO"/>
                 <signal pad-id="pb2" function="default" group="MOSI"/>
@@ -240,13 +240,13 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb7" function="default" group="OCA"/>
                 <signal pad-id="pd0" function="default" group="OCB"/>
@@ -254,7 +254,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc7" function="default" group="ICP"/>
                 <signal pad-id="pc6" function="default" group="OCA"/>
@@ -264,16 +264,16 @@
             </signals>
         </peripheral>
         <peripheral key="pll" name="PLL" module-key="pll">
-            <register-group-instance key="pll" name="PLL" description="Phase Locked Loop" register-group-key="pll" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Phase Locked Loop" register-group-key="pll" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usb_device" name="USB_DEVICE" module-key="usb_device">
-            <register-group-instance key="usb_device" name="USB_DEVICE" description="USB Device Registers" register-group-key="usb_device" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USB Device Registers" register-group-key="usb_device" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="INT"/>
                 <signal pad-id="pd1" index="1" function="default" group="INT"/>
@@ -299,7 +299,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd2" function="default" group="RXD"/>
                 <signal pad-id="pd3" function="default" group="TXD"/>
@@ -309,10 +309,10 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd1" index="0" function="default" group="AIN"/>
                 <signal pad-id="pd2" index="1" function="default" group="AIN"/>
@@ -324,10 +324,10 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY13.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY13.xml
index b193bf7e..36d27a03 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY13.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY13.xml
@@ -168,7 +168,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="default" group="ADC"/>
@@ -177,20 +177,20 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" index="1" function="default" group="AIN"/>
                 <signal pad-id="pb0" index="0" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -201,7 +201,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb5" function="default" group="PCINT5"/>
                 <signal pad-id="pb4" function="default" group="PCINT4"/>
@@ -213,7 +213,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" function="default" group="T"/>
                 <signal pad-id="pb1" function="default" group="OCB"/>
@@ -221,13 +221,13 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY13A.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY13A.xml
index 16497b86..8192db53 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY13A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY13A.xml
@@ -168,7 +168,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="default" group="ADC"/>
@@ -177,20 +177,20 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" index="1" function="default" group="AIN"/>
                 <signal pad-id="pb0" index="0" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -201,7 +201,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb5" function="default" group="PCINT5"/>
                 <signal pad-id="pb4" function="default" group="PCINT4"/>
@@ -213,7 +213,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" function="default" group="T"/>
                 <signal pad-id="pb1" function="default" group="OCB"/>
@@ -221,13 +221,13 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1604.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1604.xml
index dabd5c73..2d9b1067 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1604.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1604.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="AC0" group="N"/>
                 <signal pad-id="pa5" index="0" function="AC0" group="OUT"/>
@@ -50,7 +50,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pa1" index="1" function="AIN0" group="AIN"/>
@@ -65,10 +65,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="i2128">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN"/>
@@ -78,7 +78,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2603_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa3" function="CLKCTRL" group="CLKI"/>
                 <signal pad-id="pb3" function="CLKCTRL" group="TOSC1"/>
@@ -86,19 +86,19 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
                 <signal pad-id="pa1" function="BREAK" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="i2122">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2603_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
                 <signal pad-id="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
@@ -129,19 +129,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2603_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="i2603_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i2603_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="i2109">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -154,7 +154,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -163,25 +163,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2603_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="i2603_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="i2112">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="i2107">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
                 <signal pad-id="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
@@ -190,13 +190,13 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2603_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
                 <signal pad-id="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
@@ -208,20 +208,20 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x810"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x810"/>
             <signals>
                 <signal pad-id="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
                 <signal pad-id="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
                 <signal pad-id="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
@@ -234,22 +234,22 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="i2103_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="i2103_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="i2103_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="i2603_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i2127">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1606.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1606.xml
index 82f8ebd9..97647051 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1606.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1606.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="AC0" group="N"/>
                 <signal pad-id="pb4" index="1" function="AC0" group="N"/>
@@ -52,7 +52,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pa1" index="1" function="AIN0" group="AIN"/>
@@ -69,10 +69,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="i2128">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN"/>
@@ -85,7 +85,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2603_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa3" function="CLKCTRL" group="CLKI"/>
                 <signal pad-id="pb5" function="CLKCTRL" group="CLKO"/>
@@ -94,19 +94,19 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
                 <signal pad-id="pa1" function="BREAK" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="i2122">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2603_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
                 <signal pad-id="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
@@ -150,19 +150,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2603_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="i2603_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i2603_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="i2109">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -175,7 +175,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -186,7 +186,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -195,25 +195,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2603_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="i2603_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="i2112">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="i2107">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
                 <signal pad-id="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
@@ -226,13 +226,13 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2603_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
                 <signal pad-id="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
@@ -247,21 +247,21 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.CTRLD.TCB0"/>
                 <signal pad-id="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x810"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x810"/>
             <signals>
                 <signal pad-id="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
                 <signal pad-id="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
                 <signal pad-id="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
@@ -274,22 +274,22 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="i2103_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="i2103_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="i2103_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="i2603_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i2127">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1607.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1607.xml
index 0e2f6f09..de612476 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1607.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1607.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="AC0" group="N"/>
                 <signal pad-id="pb4" index="1" function="AC0" group="N"/>
@@ -52,7 +52,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pa1" index="1" function="AIN0" group="AIN"/>
@@ -69,10 +69,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="i2128">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN"/>
@@ -87,7 +87,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2603_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa3" function="CLKCTRL" group="CLKI"/>
                 <signal pad-id="pb5" function="CLKCTRL" group="CLKO"/>
@@ -96,20 +96,20 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
                 <signal pad-id="pc4" function="BREAK_ALT" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
                 <signal pad-id="pa1" function="BREAK" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="i2122">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2603_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
                 <signal pad-id="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
@@ -161,19 +161,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2603_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="i2603_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i2603_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="i2109">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -186,7 +186,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -199,7 +199,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -210,25 +210,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2603_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="i2603_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="i2112">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="i2107">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
                 <signal pad-id="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
@@ -241,13 +241,13 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2603_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
                 <signal pad-id="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
@@ -264,21 +264,21 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.CTRLD.TCB0"/>
                 <signal pad-id="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x810"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x810"/>
             <signals>
                 <signal pad-id="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
                 <signal pad-id="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
                 <signal pad-id="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
@@ -291,22 +291,22 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="i2103_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="i2103_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="i2103_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="i2603_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i2127">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1614.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1614.xml
index d8178505..c1b49a35 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1614.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1614.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="AC0" group="N"/>
                 <signal pad-id="pa5" index="0" function="AC0" group="OUT"/>
@@ -51,7 +51,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="i2106">
-            <register-group-instance key="ac1" name="AC1" register-group-key="ac" address-space-key="data" offset="0x688"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x688"/>
             <signals>
                 <signal pad-id="pa5" index="0" function="AC1" group="N"/>
                 <signal pad-id="pb3" index="0" function="AC1" group="OUT"/>
@@ -61,7 +61,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="i2106">
-            <register-group-instance key="ac2" name="AC2" register-group-key="ac" address-space-key="data" offset="0x690"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x690"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="AC2" group="N"/>
                 <signal pad-id="pb2" index="0" function="AC2" group="OUT"/>
@@ -70,7 +70,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pa1" index="1" function="AIN0" group="AIN"/>
@@ -85,7 +85,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc1" name="ADC1" module-key="i2132">
-            <register-group-instance key="adc1" name="ADC1" register-group-key="adc" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pa4" index="0" function="AIN1" group="AIN"/>
                 <signal pad-id="pa5" index="1" function="AIN1" group="AIN"/>
@@ -94,10 +94,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="i2128">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN"/>
@@ -107,7 +107,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2603_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa3" function="CLKCTRL" group="CLKI"/>
                 <signal pad-id="pb3" function="CLKCTRL" group="TOSC1"/>
@@ -115,31 +115,31 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
                 <signal pad-id="pa1" function="BREAK" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="i2122">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="i2121">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="dac1" name="DAC1" module-key="i2121">
-            <register-group-instance key="dac1" name="DAC1" register-group-key="dac" address-space-key="data" offset="0x6A8"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A8"/>
         </peripheral>
         <peripheral key="dac2" name="DAC2" module-key="i2121">
-            <register-group-instance key="dac2" name="DAC2" register-group-key="dac" address-space-key="data" offset="0x6B0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6B0"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2603_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
                 <signal pad-id="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
@@ -170,19 +170,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2603_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="i2603_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i2603_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="i2109">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -195,7 +195,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -204,7 +204,7 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2603_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="i2120">
             <signals>
@@ -224,22 +224,22 @@
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="i2603_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="i2112">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="i2107">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
                 <signal pad-id="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
@@ -248,13 +248,13 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2603_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
                 <signal pad-id="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
@@ -266,26 +266,26 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="i2119">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xA50"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA50"/>
             <signals>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.CTRLD.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i2129">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xA80"/>
             <signals>
                 <signal pad-id="pa4" function="TCD0" group="WOA"/>
                 <signal pad-id="pa5" function="TCD0" group="WOB"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x810"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x810"/>
             <signals>
                 <signal pad-id="pa2" function="TWI0_ALT" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
                 <signal pad-id="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
@@ -294,7 +294,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
                 <signal pad-id="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
@@ -307,22 +307,22 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="i2103_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="i2103_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="i2103_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="i2603_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i2127">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1616.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1616.xml
index d86e9525..b470bc67 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1616.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1616.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="AC0" group="N"/>
                 <signal pad-id="pb4" index="1" function="AC0" group="N"/>
@@ -53,7 +53,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="i2106">
-            <register-group-instance key="ac1" name="AC1" register-group-key="ac" address-space-key="data" offset="0x688"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x688"/>
             <signals>
                 <signal pad-id="pa5" index="0" function="AC1" group="N"/>
                 <signal pad-id="pb3" index="0" function="AC1" group="OUT"/>
@@ -64,7 +64,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="i2106">
-            <register-group-instance key="ac2" name="AC2" register-group-key="ac" address-space-key="data" offset="0x690"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x690"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="AC2" group="N"/>
                 <signal pad-id="pb2" index="0" function="AC2" group="OUT"/>
@@ -74,7 +74,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pa1" index="1" function="AIN0" group="AIN"/>
@@ -91,7 +91,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc1" name="ADC1" module-key="i2132">
-            <register-group-instance key="adc1" name="ADC1" register-group-key="adc" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pa4" index="0" function="AIN1" group="AIN"/>
                 <signal pad-id="pa5" index="1" function="AIN1" group="AIN"/>
@@ -104,10 +104,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="i2128">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN"/>
@@ -120,7 +120,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2603_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa3" function="CLKCTRL" group="CLKI"/>
                 <signal pad-id="pb5" function="CLKCTRL" group="CLKO"/>
@@ -129,31 +129,31 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
                 <signal pad-id="pa1" function="BREAK" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="i2122">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="i2121">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="dac1" name="DAC1" module-key="i2121">
-            <register-group-instance key="dac1" name="DAC1" register-group-key="dac" address-space-key="data" offset="0x6A8"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A8"/>
         </peripheral>
         <peripheral key="dac2" name="DAC2" module-key="i2121">
-            <register-group-instance key="dac2" name="DAC2" register-group-key="dac" address-space-key="data" offset="0x6B0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6B0"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2603_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
                 <signal pad-id="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
@@ -197,19 +197,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2603_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="i2603_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i2603_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="i2109">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -222,7 +222,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -233,7 +233,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -242,7 +242,7 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2603_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="i2120">
             <signals>
@@ -275,22 +275,22 @@
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="i2603_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="i2112">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="i2107">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
                 <signal pad-id="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
@@ -303,13 +303,13 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2603_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
                 <signal pad-id="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
@@ -324,20 +324,20 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.CTRLD.TCB0"/>
                 <signal pad-id="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="i2119">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xA50"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA50"/>
             <signals>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.CTRLD.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i2129">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xA80"/>
             <signals>
                 <signal pad-id="pa4" function="TCD0" group="WOA"/>
                 <signal pad-id="pa5" function="TCD0" group="WOB"/>
@@ -346,7 +346,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x810"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x810"/>
             <signals>
                 <signal pad-id="pa2" function="TWI0_ALT" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
                 <signal pad-id="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
@@ -355,7 +355,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
                 <signal pad-id="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
@@ -368,22 +368,22 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="i2103_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="i2103_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="i2103_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="i2603_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i2127">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1617.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1617.xml
index 0efb4e34..5248775e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1617.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1617.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="AC0" group="N"/>
                 <signal pad-id="pb4" index="1" function="AC0" group="N"/>
@@ -54,7 +54,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="i2106">
-            <register-group-instance key="ac1" name="AC1" register-group-key="ac" address-space-key="data" offset="0x688"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x688"/>
             <signals>
                 <signal pad-id="pa5" index="0" function="AC1" group="N"/>
                 <signal pad-id="pb7" index="1" function="AC1" group="N"/>
@@ -66,7 +66,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="i2106">
-            <register-group-instance key="ac2" name="AC2" register-group-key="ac" address-space-key="data" offset="0x690"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x690"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="AC2" group="N"/>
                 <signal pad-id="pb6" index="1" function="AC2" group="N"/>
@@ -78,7 +78,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pa1" index="1" function="AIN0" group="AIN"/>
@@ -95,7 +95,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc1" name="ADC1" module-key="i2132">
-            <register-group-instance key="adc1" name="ADC1" register-group-key="adc" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pa4" index="0" function="AIN1" group="AIN"/>
                 <signal pad-id="pa5" index="1" function="AIN1" group="AIN"/>
@@ -112,10 +112,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="i2128">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN"/>
@@ -130,7 +130,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2603_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa3" function="CLKCTRL" group="CLKI"/>
                 <signal pad-id="pb5" function="CLKCTRL" group="CLKO"/>
@@ -139,32 +139,32 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
                 <signal pad-id="pc4" function="BREAK_ALT" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
                 <signal pad-id="pa1" function="BREAK" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="i2122">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="i2121">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="dac1" name="DAC1" module-key="i2121">
-            <register-group-instance key="dac1" name="DAC1" register-group-key="dac" address-space-key="data" offset="0x6A8"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A8"/>
         </peripheral>
         <peripheral key="dac2" name="DAC2" module-key="i2121">
-            <register-group-instance key="dac2" name="DAC2" register-group-key="dac" address-space-key="data" offset="0x6B0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6B0"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2603_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
                 <signal pad-id="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
@@ -216,19 +216,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2603_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="i2603_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i2603_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="i2109">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -241,7 +241,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -254,7 +254,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -265,7 +265,7 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2603_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="i2120">
             <signals>
@@ -302,22 +302,22 @@
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="i2603_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="i2112">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="i2107">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
                 <signal pad-id="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
@@ -330,13 +330,13 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2603_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
                 <signal pad-id="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
@@ -353,21 +353,21 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.CTRLD.TCB0"/>
                 <signal pad-id="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="i2119">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xA50"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA50"/>
             <signals>
                 <signal pad-id="pc4" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.CTRLD.TCB1"/>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.CTRLD.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i2129">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xA80"/>
             <signals>
                 <signal pad-id="pa4" function="TCD0" group="WOA"/>
                 <signal pad-id="pa5" function="TCD0" group="WOB"/>
@@ -376,7 +376,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x810"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x810"/>
             <signals>
                 <signal pad-id="pa2" function="TWI0_ALT" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
                 <signal pad-id="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
@@ -385,7 +385,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
                 <signal pad-id="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
@@ -398,22 +398,22 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="i2103_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="i2103_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="i2103_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="i2603_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i2127">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1624.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1624.xml
index b85d05b5..73eb7306 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1624.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1624.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_avr_v3">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="AC0" group="N"/>
                 <signal pad-id="pb0" index="2" function="AC0" group="N"/>
@@ -52,7 +52,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v2">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa1" index="1" function="AIN0" group="AIN"/>
                 <signal pad-id="pa2" index="2" function="AIN0" group="AIN"/>
@@ -66,10 +66,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_avr_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL_IN" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
                 <signal pad-id="pa1" index="1" function="CCL_IN" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
@@ -84,7 +84,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa3" function="CLKCTRL" group="CLKI"/>
                 <signal pad-id="pb3" function="CLKCTRL" group="TOSC1"/>
@@ -92,19 +92,19 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_v2">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
                 <signal pad-id="pa1" function="OTHER" group="BREAK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_avr_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="ev_ctrl_v1">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -112,19 +112,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="chip_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="chip_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v2_nvmctrl">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -137,7 +137,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -146,25 +146,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_avr_v1">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="chip_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_avr_v1">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pa2" function="SPI" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pa1" function="SPI" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -173,13 +173,13 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
                 <signal pad-id="pa0" function="PDI" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pb3" index="0" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pb0" index="0" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -191,26 +191,26 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA80"/>
             <signals>
                 <signal pad-id="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xA90"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA90"/>
             <signals>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_avr_v1">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pb0" function="I2C" group="SCL"/>
                 <signal pad-id="pb1" function="I2C" group="SDA"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pb3" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -223,7 +223,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pa2" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pa1" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -232,22 +232,22 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_avr_v1_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="gpio_ports_avr_v1_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_avr_v1_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="chip_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_avr_v1">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1626.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1626.xml
index 3115c0fb..2d9b008f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1626.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1626.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_avr_v3">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="AC0" group="N"/>
                 <signal pad-id="pb4" index="1" function="AC0" group="N"/>
@@ -54,7 +54,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v2">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa1" index="1" function="AIN0" group="AIN"/>
                 <signal pad-id="pa2" index="2" function="AIN0" group="AIN"/>
@@ -74,10 +74,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_avr_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL_IN" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
                 <signal pad-id="pa1" index="1" function="CCL_IN" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
@@ -98,7 +98,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa3" function="CLKCTRL" group="CLKI"/>
                 <signal pad-id="pb5" function="CLKCTRL" group="CLKO"/>
@@ -107,19 +107,19 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_v2">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
                 <signal pad-id="pa1" function="OTHER" group="BREAK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_avr_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="ev_ctrl_v1">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -128,19 +128,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="chip_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="chip_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v2_nvmctrl">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -153,7 +153,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -164,7 +164,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -173,26 +173,26 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_avr_v1">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="RESET"/>
                 <signal pad-id="pb4" function="OTHER" group="RESET_ALT"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="chip_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_avr_v1">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc1" function="SPI_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pa2" function="SPI" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -205,13 +205,13 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
                 <signal pad-id="pa0" function="PDI" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pb3" index="0" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pb0" index="0" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -226,27 +226,27 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA80"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
                 <signal pad-id="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xA90"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA90"/>
             <signals>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_avr_v1">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pb0" function="I2C" group="SCL"/>
                 <signal pad-id="pb1" function="I2C" group="SDA"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pb3" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -259,7 +259,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="USART1_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pa2" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -272,22 +272,22 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_avr_v1_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="gpio_ports_avr_v1_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_avr_v1_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="chip_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_avr_v1">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1627.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1627.xml
index 97111c27..0ab1ba50 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1627.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1627.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="cmp_control_avr_v3">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="AC0" group="N"/>
                 <signal pad-id="pb4" index="1" function="AC0" group="N"/>
@@ -55,7 +55,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v2">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa1" index="1" function="AIN0" group="AIN"/>
                 <signal pad-id="pa2" index="2" function="AIN0" group="AIN"/>
@@ -75,10 +75,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_avr_v1">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL_IN" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
                 <signal pad-id="pa1" index="1" function="CCL_IN" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
@@ -103,7 +103,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa3" function="CLKCTRL" group="CLKI"/>
                 <signal pad-id="pb5" function="CLKCTRL" group="CLKO"/>
@@ -112,20 +112,20 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_v2">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
                 <signal pad-id="pa1" function="OTHER" group="BREAK"/>
                 <signal pad-id="pc4" function="OTHER" group="BREAK_ALT"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="math_pdi_crc_avr_v1">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="ev_ctrl_v1">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
                 <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
@@ -135,19 +135,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="chip_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="chip_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="nvm_ctrl_avr_v2_nvmctrl">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -160,7 +160,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -173,7 +173,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -184,26 +184,26 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x5E0"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_avr_v1">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="RESET"/>
                 <signal pad-id="pb4" function="OTHER" group="RESET_ALT"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="chip_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="clk_sleep_ctrl_avr_v1">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc1" function="SPI_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
                 <signal pad-id="pa2" function="SPI" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
@@ -216,13 +216,13 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
                 <signal pad-id="pa0" function="PDI" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pb3" index="0" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
                 <signal pad-id="pb0" index="0" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
@@ -239,28 +239,28 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA80"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
                 <signal pad-id="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="tmr_16b_capture_v1">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xA90"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA90"/>
             <signals>
                 <signal pad-id="pc4" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_avr_v1">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pb0" function="I2C" group="SCL"/>
                 <signal pad-id="pb1" function="I2C" group="SDA"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
                 <signal pad-id="pb3" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
@@ -273,7 +273,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
-            <register-group-instance key="usart1" name="USART1" register-group-key="usart" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="USART1_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
                 <signal pad-id="pa2" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
@@ -286,22 +286,22 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="gpio_ports_avr_v1_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="gpio_ports_avr_v1_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="gpio_ports_avr_v1_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="chip_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_avr_v1">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1634.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1634.xml
index 247af7b7..d99fa139 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1634.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1634.xml
@@ -168,10 +168,10 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -180,7 +180,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -191,7 +191,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -204,43 +204,43 @@
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY167.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY167.xml
index 5112d9ca..55d3fd43 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY167.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY167.xml
@@ -170,7 +170,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -183,7 +183,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -196,49 +196,49 @@
             </signals>
         </peripheral>
         <peripheral key="linuart" name="LINUART" module-key="linuart">
-            <register-group-instance key="linuart" name="LINUART" description="Local Interconnect Network" register-group-key="linuart" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Local Interconnect Network" register-group-key="linuart" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8_async">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit Async" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="current_source" name="CURRENT_SOURCE" module-key="current_source">
-            <register-group-instance key="current_source" name="CURRENT_SOURCE" description="Current Source" register-group-key="current_source" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Current Source" register-group-key="current_source" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY202.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY202.xml
index 26dc6470..03acd41d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY202.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY202.xml
@@ -41,7 +41,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x670"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x670"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="AC0" group="N"/>
                 <signal pad-id="pa3" function="AC0" group="OUT"/>
@@ -49,7 +49,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pa1" index="1" function="AIN0" group="AIN"/>
@@ -60,10 +60,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="i2128">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN"/>
@@ -72,25 +72,25 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2601_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa3" function="CLKCTRL" group="CLKI"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
                 <signal pad-id="pa1" function="OTHER" group="BREAK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="i2122">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2601_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
                 <signal pad-id="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
@@ -108,19 +108,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2601_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="i2601_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i2601_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="i2109">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -131,25 +131,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2601_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="i2601_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="i2112">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="i2107">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pa7" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
                 <signal pad-id="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
@@ -160,13 +160,13 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2601_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
                 <signal pad-id="pa3" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
@@ -176,20 +176,20 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pa6" function="TCB0" group="WO"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x810"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x810"/>
             <signals>
                 <signal pad-id="pa2" function="TWI0" group="SCL"/>
                 <signal pad-id="pa1" function="TWI0" group="SDA"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
                 <signal pad-id="pa7" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
@@ -200,22 +200,22 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2601_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="i2103_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="i2103_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="i2103_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="i2601_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i2127">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY204.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY204.xml
index bfea0b4a..48ed543a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY204.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY204.xml
@@ -41,7 +41,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x670"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x670"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="AC0" group="N"/>
                 <signal pad-id="pa5" index="0" function="AC0" group="OUT"/>
@@ -49,7 +49,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pa1" index="1" function="AIN0" group="AIN"/>
@@ -64,10 +64,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="i2128">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN"/>
@@ -77,7 +77,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2601_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa3" function="CLKCTRL" group="CLKI"/>
                 <signal pad-id="pb3" function="CLKCTRL" group="TOSC1"/>
@@ -85,19 +85,19 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
                 <signal pad-id="pa1" function="OTHER" group="BREAK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="i2122">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2601_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
                 <signal pad-id="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
@@ -128,19 +128,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2601_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="i2601_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i2601_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="i2109">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -153,7 +153,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -162,25 +162,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2601_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="i2601_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="i2112">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="i2107">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pa7" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
                 <signal pad-id="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
@@ -191,13 +191,13 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2601_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
                 <signal pad-id="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
@@ -209,20 +209,20 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x810"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x810"/>
             <signals>
                 <signal pad-id="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
                 <signal pad-id="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
                 <signal pad-id="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
@@ -235,22 +235,22 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2601_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="i2103_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="i2103_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="i2103_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="i2601_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i2127">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY212.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY212.xml
index 87379d30..c25f1935 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY212.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY212.xml
@@ -41,7 +41,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x670"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x670"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="AC0" group="N"/>
                 <signal pad-id="pa3" function="AC0" group="OUT"/>
@@ -49,7 +49,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pa1" index="1" function="AIN0" group="AIN"/>
@@ -60,10 +60,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="i2128">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN"/>
@@ -72,31 +72,31 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2601_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa3" function="CLKCTRL" group="CLKI"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
                 <signal pad-id="pa1" function="OTHER" group="BREAK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="i2122">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="i2121">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2601_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
                 <signal pad-id="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
@@ -114,19 +114,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2601_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="i2601_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i2601_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="i2109">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -137,25 +137,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2601_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="i2601_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="i2112">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="i2107">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pa7" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
                 <signal pad-id="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
@@ -166,13 +166,13 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2601_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
                 <signal pad-id="pa3" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
@@ -182,27 +182,27 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pa6" function="TCB0" group="WO"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i2129">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xA80"/>
             <signals>
                 <signal pad-id="pa6" function="TCD0" group="WOA"/>
                 <signal pad-id="pa7" function="TCD0" group="WOB"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x810"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x810"/>
             <signals>
                 <signal pad-id="pa2" function="TWI0" group="SCL"/>
                 <signal pad-id="pa1" function="TWI0" group="SDA"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
                 <signal pad-id="pa7" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
@@ -213,22 +213,22 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2601_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="i2103_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="i2103_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="i2103_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="i2601_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i2127">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY214.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY214.xml
index 21a1468a..ae6cf201 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY214.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY214.xml
@@ -41,7 +41,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x670"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x670"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="AC0" group="N"/>
                 <signal pad-id="pa5" index="0" function="AC0" group="OUT"/>
@@ -49,7 +49,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pa1" index="1" function="AIN0" group="AIN"/>
@@ -64,10 +64,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="i2128">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN"/>
@@ -77,7 +77,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2601_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa3" function="CLKCTRL" group="CLKI"/>
                 <signal pad-id="pb3" function="CLKCTRL" group="TOSC1"/>
@@ -85,25 +85,25 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
                 <signal pad-id="pa1" function="OTHER" group="BREAK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="i2122">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="i2121">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2601_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
                 <signal pad-id="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
@@ -134,19 +134,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2601_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="i2601_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i2601_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="i2109">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -159,7 +159,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -168,25 +168,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2601_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="i2601_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="i2112">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="i2107">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pa7" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
                 <signal pad-id="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
@@ -197,13 +197,13 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2601_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
                 <signal pad-id="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
@@ -215,20 +215,20 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i2129">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xA80"/>
             <signals>
                 <signal pad-id="pa4" function="TCD0" group="WOA"/>
                 <signal pad-id="pa5" function="TCD0" group="WOB"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x810"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x810"/>
             <signals>
                 <signal pad-id="pa2" function="TWI0_ALT" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
                 <signal pad-id="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
@@ -237,7 +237,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
                 <signal pad-id="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
@@ -250,22 +250,22 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2601_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="i2103_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="i2103_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="i2103_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="i2601_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i2127">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY2313.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY2313.xml
index a8ae85c6..1c8c1fc6 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY2313.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY2313.xml
@@ -196,7 +196,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -209,7 +209,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -221,7 +221,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -229,37 +229,37 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart" name="USART" module-key="usart">
-            <register-group-instance key="usart" name="USART" description="USART" register-group-key="usart" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY2313A.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY2313A.xml
index 47523d73..82063414 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY2313A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY2313A.xml
@@ -196,7 +196,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -209,7 +209,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -221,7 +221,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -229,37 +229,37 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart" name="USART" module-key="usart">
-            <register-group-instance key="usart" name="USART" description="USART" register-group-key="usart" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY24.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY24.xml
index 9bb0c9aa..643e4579 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY24.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY24.xml
@@ -168,7 +168,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -181,7 +181,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -190,40 +190,40 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY24A.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY24A.xml
index 6bc2c7ed..60061837 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY24A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY24A.xml
@@ -168,7 +168,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -181,7 +181,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -190,14 +190,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa1" index="0" function="ACIN" group="AIN"/>
                 <signal pad-id="pa2" index="1" function="ACIN" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -211,7 +211,7 @@
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa4" function="TWI" group="SCL"/>
                 <signal pad-id="pa6" function="TWI" group="SDA"/>
@@ -221,7 +221,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="EXTINT" group="PCINT"/>
                 <signal pad-id="pa1" index="1" function="EXTINT" group="PCINT"/>
@@ -239,13 +239,13 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa3" function="T0" group="T0"/>
                 <signal pad-id="pa7" function="T0" group="OC0B"/>
@@ -253,7 +253,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa4" function="T1" group="T1"/>
                 <signal pad-id="pa5" function="T1" group="OC1B"/>
@@ -262,16 +262,16 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY25.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY25.xml
index e9fe502d..3585da9e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY25.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY25.xml
@@ -168,7 +168,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -179,14 +179,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" index="1" function="ACIN" group="AIN"/>
                 <signal pad-id="pb0" index="0" function="ACIN" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb5" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pb2" index="1" function="ADC" group="ADC"/>
@@ -195,7 +195,7 @@
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="TWI" group="SDA"/>
                 <signal pad-id="pb2" function="TWI" group="SCL"/>
@@ -205,7 +205,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="EXTINT" group="PCINT"/>
                 <signal pad-id="pb1" index="1" function="EXTINT" group="PCINT"/>
@@ -217,13 +217,13 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" function="T0" group="T0"/>
                 <signal pad-id="pb1" function="T0" group="OC0B"/>
@@ -231,7 +231,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc8">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 8-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb4" function="T1" group="OC1B"/>
                 <signal pad-id="pb3" function="T1" group="OC1BINV"/>
@@ -240,16 +240,16 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261.xml
index 705e62cc..745a7e6d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261.xml
@@ -196,7 +196,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -209,7 +209,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -222,7 +222,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -239,7 +239,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="ACIN" group="AIN"/>
                 <signal pad-id="pa6" index="1" function="ACIN" group="AIN"/>
@@ -247,7 +247,7 @@
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="USI" group="SDA" field="USIPOS"/>
                 <signal pad-id="pb2" function="USI" group="SCL" field="USIPOS"/>
@@ -262,20 +262,20 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa4" function="T0" group="ICP0"/>
                 <signal pad-id="pb6" function="T0" group="T0"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc8">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 8-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="T1" group="OC1AINV"/>
                 <signal pad-id="pb1" function="T1" group="OC1A"/>
@@ -286,10 +286,10 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="EXTINT" group="PCINT"/>
                 <signal pad-id="pa1" index="1" function="EXTINT" group="PCINT"/>
@@ -312,13 +312,13 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261A.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261A.xml
index 97f97cac..075045c8 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261A.xml
@@ -196,7 +196,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -209,7 +209,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -222,40 +222,40 @@
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc8">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 8-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY3216.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY3216.xml
index 6487c10a..2b87de4c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY3216.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY3216.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="AC0" group="N"/>
                 <signal pad-id="pb4" index="1" function="AC0" group="N"/>
@@ -53,7 +53,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="i2106">
-            <register-group-instance key="ac1" name="AC1" register-group-key="ac" address-space-key="data" offset="0x688"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x688"/>
             <signals>
                 <signal pad-id="pa5" index="0" function="AC1" group="N"/>
                 <signal pad-id="pb3" index="0" function="AC1" group="OUT"/>
@@ -64,7 +64,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="i2106">
-            <register-group-instance key="ac2" name="AC2" register-group-key="ac" address-space-key="data" offset="0x690"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x690"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="AC2" group="N"/>
                 <signal pad-id="pb2" index="0" function="AC2" group="OUT"/>
@@ -74,7 +74,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pa1" index="1" function="AIN0" group="AIN"/>
@@ -91,7 +91,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc1" name="ADC1" module-key="i2132">
-            <register-group-instance key="adc1" name="ADC1" register-group-key="adc" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pa4" index="0" function="AIN1" group="AIN"/>
                 <signal pad-id="pa5" index="1" function="AIN1" group="AIN"/>
@@ -104,10 +104,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="i2128">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN"/>
@@ -120,7 +120,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2603_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa3" function="CLKCTRL" group="CLKI"/>
                 <signal pad-id="pb5" function="CLKCTRL" group="CLKO"/>
@@ -129,31 +129,31 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
                 <signal pad-id="pa1" function="BREAK" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="i2122">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="i2121">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="dac1" name="DAC1" module-key="i2121">
-            <register-group-instance key="dac1" name="DAC1" register-group-key="dac" address-space-key="data" offset="0x6A8"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A8"/>
         </peripheral>
         <peripheral key="dac2" name="DAC2" module-key="i2121">
-            <register-group-instance key="dac2" name="DAC2" register-group-key="dac" address-space-key="data" offset="0x6B0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6B0"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2603_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
                 <signal pad-id="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
@@ -197,19 +197,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2603_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="i2603_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i2603_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="i2109">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -222,7 +222,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -233,7 +233,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -242,7 +242,7 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2603_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="i2120">
             <signals>
@@ -275,22 +275,22 @@
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="i2603_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="i2112">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="i2107">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
                 <signal pad-id="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
@@ -303,13 +303,13 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2603_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
                 <signal pad-id="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
@@ -324,20 +324,20 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.CTRLD.TCB0"/>
                 <signal pad-id="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="i2119">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xA50"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA50"/>
             <signals>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.CTRLD.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i2129">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xA80"/>
             <signals>
                 <signal pad-id="pa4" function="TCD0" group="WOA"/>
                 <signal pad-id="pa5" function="TCD0" group="WOB"/>
@@ -346,7 +346,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x810"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x810"/>
             <signals>
                 <signal pad-id="pa2" function="TWI0_ALT" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
                 <signal pad-id="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
@@ -355,7 +355,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
                 <signal pad-id="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
@@ -368,22 +368,22 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="i2103_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="i2103_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="i2103_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="i2603_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i2127">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY3217.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY3217.xml
index f30c0cfc..1e2109f4 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY3217.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY3217.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="AC0" group="N"/>
                 <signal pad-id="pb4" index="1" function="AC0" group="N"/>
@@ -54,7 +54,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="i2106">
-            <register-group-instance key="ac1" name="AC1" register-group-key="ac" address-space-key="data" offset="0x688"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x688"/>
             <signals>
                 <signal pad-id="pa5" index="0" function="AC1" group="N"/>
                 <signal pad-id="pb7" index="1" function="AC1" group="N"/>
@@ -66,7 +66,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="i2106">
-            <register-group-instance key="ac2" name="AC2" register-group-key="ac" address-space-key="data" offset="0x690"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x690"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="AC2" group="N"/>
                 <signal pad-id="pb6" index="1" function="AC2" group="N"/>
@@ -78,7 +78,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pa1" index="1" function="AIN0" group="AIN"/>
@@ -95,7 +95,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc1" name="ADC1" module-key="i2132">
-            <register-group-instance key="adc1" name="ADC1" register-group-key="adc" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pa4" index="0" function="AIN1" group="AIN"/>
                 <signal pad-id="pa5" index="1" function="AIN1" group="AIN"/>
@@ -112,10 +112,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="i2128">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN"/>
@@ -130,7 +130,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2603_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa3" function="CLKCTRL" group="CLKI"/>
                 <signal pad-id="pb5" function="CLKCTRL" group="CLKO"/>
@@ -139,32 +139,32 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
                 <signal pad-id="pc4" function="BREAK_ALT" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
                 <signal pad-id="pa1" function="BREAK" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="i2122">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="i2121">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="dac1" name="DAC1" module-key="i2121">
-            <register-group-instance key="dac1" name="DAC1" register-group-key="dac" address-space-key="data" offset="0x6A8"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A8"/>
         </peripheral>
         <peripheral key="dac2" name="DAC2" module-key="i2121">
-            <register-group-instance key="dac2" name="DAC2" register-group-key="dac" address-space-key="data" offset="0x6B0"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6B0"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2603_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
                 <signal pad-id="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
@@ -216,19 +216,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2603_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="i2603_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i2603_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="i2109">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -241,7 +241,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -254,7 +254,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -265,7 +265,7 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2603_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="i2120">
             <signals>
@@ -302,22 +302,22 @@
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="i2603_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="i2112">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="i2107">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
                 <signal pad-id="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
@@ -330,13 +330,13 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2603_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
                 <signal pad-id="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
@@ -353,21 +353,21 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.CTRLD.TCB0"/>
                 <signal pad-id="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="i2119">
-            <register-group-instance key="tcb1" name="TCB1" register-group-key="tcb" address-space-key="data" offset="0xA50"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA50"/>
             <signals>
                 <signal pad-id="pc4" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.CTRLD.TCB1"/>
                 <signal pad-id="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.CTRLD.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i2129">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xA80"/>
             <signals>
                 <signal pad-id="pa4" function="TCD0" group="WOA"/>
                 <signal pad-id="pa5" function="TCD0" group="WOB"/>
@@ -376,7 +376,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x810"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x810"/>
             <signals>
                 <signal pad-id="pa2" function="TWI0_ALT" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
                 <signal pad-id="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
@@ -385,7 +385,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
                 <signal pad-id="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
@@ -398,22 +398,22 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="i2103_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="i2103_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="i2103_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="i2603_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i2127">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY402.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY402.xml
index 740ed1aa..26fa908a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY402.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY402.xml
@@ -41,7 +41,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x670"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x670"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="AC0" group="N"/>
                 <signal pad-id="pa3" function="AC0" group="OUT"/>
@@ -49,7 +49,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pa1" index="1" function="AIN0" group="AIN"/>
@@ -60,10 +60,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="i2128">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN"/>
@@ -72,25 +72,25 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2601_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa3" function="CLKCTRL" group="CLKI"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
                 <signal pad-id="pa1" function="OTHER" group="BREAK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="i2122">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2601_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
                 <signal pad-id="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
@@ -108,19 +108,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2601_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="i2601_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i2601_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="i2109">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -131,25 +131,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2601_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="i2601_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="i2112">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="i2107">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pa7" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
                 <signal pad-id="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
@@ -160,13 +160,13 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2601_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
                 <signal pad-id="pa3" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
@@ -176,20 +176,20 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pa6" function="TCB0" group="WO"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x810"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x810"/>
             <signals>
                 <signal pad-id="pa2" function="TWI0" group="SCL"/>
                 <signal pad-id="pa1" function="TWI0" group="SDA"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
                 <signal pad-id="pa7" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
@@ -200,22 +200,22 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2601_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="i2103_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="i2103_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="i2103_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="i2601_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i2127">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY404.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY404.xml
index 7f767534..d5a590f9 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY404.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY404.xml
@@ -41,7 +41,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x670"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x670"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="AC0" group="N"/>
                 <signal pad-id="pa5" index="0" function="AC0" group="OUT"/>
@@ -49,7 +49,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pa1" index="1" function="AIN0" group="AIN"/>
@@ -64,10 +64,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="i2128">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN"/>
@@ -77,7 +77,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2601_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa3" function="CLKCTRL" group="CLKI"/>
                 <signal pad-id="pb3" function="CLKCTRL" group="TOSC1"/>
@@ -85,19 +85,19 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
                 <signal pad-id="pa1" function="OTHER" group="BREAK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="i2122">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2601_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
                 <signal pad-id="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
@@ -128,19 +128,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2601_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="i2601_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i2601_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="i2109">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -153,7 +153,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -162,25 +162,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2601_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="i2601_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="i2112">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="i2107">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pa7" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
                 <signal pad-id="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
@@ -191,13 +191,13 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2601_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
                 <signal pad-id="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
@@ -209,20 +209,20 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x810"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x810"/>
             <signals>
                 <signal pad-id="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
                 <signal pad-id="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
                 <signal pad-id="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
@@ -235,22 +235,22 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2601_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="i2103_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="i2103_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="i2103_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="i2601_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i2127">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY406.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY406.xml
index 37c0dd7f..1c607391 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY406.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY406.xml
@@ -41,7 +41,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x670"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x670"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="AC0" group="N"/>
                 <signal pad-id="pb4" index="1" function="AC0" group="N"/>
@@ -51,7 +51,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pa1" index="1" function="AIN0" group="AIN"/>
@@ -68,10 +68,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="i2128">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN"/>
@@ -84,7 +84,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2601_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa3" function="CLKCTRL" group="CLKI"/>
                 <signal pad-id="pb5" function="CLKCTRL" group="CLKO"/>
@@ -93,19 +93,19 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
                 <signal pad-id="pa1" function="OTHER" group="BREAK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="i2122">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2601_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
                 <signal pad-id="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
@@ -149,19 +149,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2601_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="i2601_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i2601_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="i2109">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -174,7 +174,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -185,7 +185,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -194,25 +194,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2601_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="i2601_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="i2112">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="i2107">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
                 <signal pad-id="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
@@ -225,13 +225,13 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2601_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
                 <signal pad-id="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
@@ -246,21 +246,21 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.CTRLD.TCB0"/>
                 <signal pad-id="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x810"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x810"/>
             <signals>
                 <signal pad-id="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
                 <signal pad-id="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
                 <signal pad-id="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
@@ -273,22 +273,22 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2601_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="i2103_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="i2103_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="i2103_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="i2601_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i2127">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY412.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY412.xml
index bc65a714..f56d68db 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY412.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY412.xml
@@ -41,7 +41,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x670"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x670"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="AC0" group="N"/>
                 <signal pad-id="pa3" function="AC0" group="OUT"/>
@@ -49,7 +49,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pa1" index="1" function="AIN0" group="AIN"/>
@@ -60,10 +60,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="i2128">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN"/>
@@ -72,31 +72,31 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2601_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa3" function="CLKCTRL" group="CLKI"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
                 <signal pad-id="pa1" function="OTHER" group="BREAK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="i2122">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="i2121">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2601_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
                 <signal pad-id="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
@@ -114,19 +114,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2601_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="i2601_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i2601_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="i2109">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -137,25 +137,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2601_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="i2601_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="i2112">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="i2107">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pa7" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
                 <signal pad-id="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
@@ -166,13 +166,13 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2601_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
                 <signal pad-id="pa3" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
@@ -182,27 +182,27 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pa6" function="TCB0" group="WO"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i2129">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xA80"/>
             <signals>
                 <signal pad-id="pa6" function="TCD0" group="WOA"/>
                 <signal pad-id="pa7" function="TCD0" group="WOB"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x810"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x810"/>
             <signals>
                 <signal pad-id="pa2" function="TWI0" group="SCL"/>
                 <signal pad-id="pa1" function="TWI0" group="SDA"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
                 <signal pad-id="pa7" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
@@ -213,22 +213,22 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2601_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="i2103_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="i2103_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="i2103_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="i2601_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i2127">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY414.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY414.xml
index 4d5f2c2f..41b1d477 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY414.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY414.xml
@@ -41,7 +41,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x670"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x670"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="AC0" group="N"/>
                 <signal pad-id="pa5" index="0" function="AC0" group="OUT"/>
@@ -49,7 +49,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pa1" index="1" function="AIN0" group="AIN"/>
@@ -64,10 +64,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="i2128">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN"/>
@@ -77,7 +77,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2601_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa3" function="CLKCTRL" group="CLKI"/>
                 <signal pad-id="pb3" function="CLKCTRL" group="TOSC1"/>
@@ -85,25 +85,25 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
                 <signal pad-id="pa1" function="OTHER" group="BREAK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="i2122">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="i2121">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2601_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
                 <signal pad-id="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
@@ -134,19 +134,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2601_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="i2601_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i2601_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="i2109">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -159,7 +159,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -168,25 +168,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2601_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="i2601_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="i2112">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="i2107">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pa7" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
                 <signal pad-id="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
@@ -197,13 +197,13 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2601_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
                 <signal pad-id="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
@@ -215,20 +215,20 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i2129">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xA80"/>
             <signals>
                 <signal pad-id="pa4" function="TCD0" group="WOA"/>
                 <signal pad-id="pa5" function="TCD0" group="WOB"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x810"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x810"/>
             <signals>
                 <signal pad-id="pa2" function="TWI0_ALT" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
                 <signal pad-id="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
@@ -237,7 +237,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
                 <signal pad-id="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
@@ -250,22 +250,22 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2601_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="i2103_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="i2103_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="i2103_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="i2601_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i2127">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY416.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY416.xml
index 40f6be36..51978d19 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY416.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY416.xml
@@ -41,7 +41,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x670"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x670"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="AC0" group="N"/>
                 <signal pad-id="pb4" index="1" function="AC0" group="N"/>
@@ -51,7 +51,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pa1" index="1" function="AIN0" group="AIN"/>
@@ -68,10 +68,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="i2128">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN"/>
@@ -84,7 +84,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2601_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa3" function="CLKCTRL" group="CLKI"/>
                 <signal pad-id="pb5" function="CLKCTRL" group="CLKO"/>
@@ -93,25 +93,25 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
                 <signal pad-id="pa1" function="OTHER" group="BREAK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="i2122">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="i2121">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2601_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
                 <signal pad-id="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
@@ -155,19 +155,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2601_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="i2601_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i2601_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="i2109">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -180,7 +180,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -191,7 +191,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -200,25 +200,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2601_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="i2601_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="i2112">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="i2107">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
                 <signal pad-id="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
@@ -231,13 +231,13 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2601_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
                 <signal pad-id="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
@@ -252,14 +252,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.CTRLD.TCB0"/>
                 <signal pad-id="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i2129">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xA80"/>
             <signals>
                 <signal pad-id="pa4" function="TCD0" group="WOA"/>
                 <signal pad-id="pa5" function="TCD0" group="WOB"/>
@@ -268,7 +268,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x810"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x810"/>
             <signals>
                 <signal pad-id="pa2" function="TWI0_ALT" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
                 <signal pad-id="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
@@ -277,7 +277,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
                 <signal pad-id="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
@@ -290,22 +290,22 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2601_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="i2103_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="i2103_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="i2103_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="i2601_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i2127">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY417.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY417.xml
index 060672c8..80b700fd 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY417.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY417.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x670"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x670"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="AC0" group="N"/>
                 <signal pad-id="pb4" index="1" function="AC0" group="N"/>
@@ -52,7 +52,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pa1" index="1" function="AIN0" group="AIN"/>
@@ -69,10 +69,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="i2128">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN"/>
@@ -87,7 +87,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2600_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa3" function="CLKCTRL" group="CLKI"/>
                 <signal pad-id="pb5" function="CLKCTRL" group="CLKO"/>
@@ -96,26 +96,26 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
                 <signal pad-id="pc4" function="BREAK_ALT" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
                 <signal pad-id="pa1" function="BREAK" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="i2122">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="i2121">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2600_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
                 <signal pad-id="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
@@ -167,19 +167,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2600_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="i2600_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i2600_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="i2109">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -192,7 +192,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -205,7 +205,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -216,7 +216,7 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2600_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="i2120">
             <signals>
@@ -237,22 +237,22 @@
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="i2600_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="i2112">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="i2107">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
                 <signal pad-id="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
@@ -265,13 +265,13 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2600_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
                 <signal pad-id="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
@@ -288,14 +288,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.CTRLD.TCB0"/>
                 <signal pad-id="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i2129">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xA80"/>
             <signals>
                 <signal pad-id="pa4" function="TCD0" group="WOA"/>
                 <signal pad-id="pa5" function="TCD0" group="WOB"/>
@@ -304,7 +304,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x810"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x810"/>
             <signals>
                 <signal pad-id="pa2" function="TWI0_ALT" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
                 <signal pad-id="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
@@ -313,7 +313,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
                 <signal pad-id="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
@@ -326,22 +326,22 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2600_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="i2103_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="i2103_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="i2103_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="i2600_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i2127">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY4313.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY4313.xml
index 2f729b4f..e8cdf266 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY4313.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY4313.xml
@@ -196,7 +196,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -209,7 +209,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -221,7 +221,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -229,37 +229,37 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart" name="USART" module-key="usart">
-            <register-group-instance key="usart" name="USART" description="USART" register-group-key="usart" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY43U.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY43U.xml
index 046928c8..f8987f31 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY43U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY43U.xml
@@ -170,7 +170,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -183,7 +183,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -196,40 +196,40 @@
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc8">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 8-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY44.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY44.xml
index affc16e1..39b2c82e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY44.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY44.xml
@@ -168,7 +168,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -181,7 +181,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -190,40 +190,40 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY441.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY441.xml
index 08c09790..495912fc 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY441.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY441.xml
@@ -169,7 +169,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -178,7 +178,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -191,7 +191,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa4" function="USART" group="RXD"/>
                 <signal pad-id="pa5" function="USART" group="TXD"/>
@@ -199,7 +199,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa1" function="USART" group="TXD" field="U0MAP"/>
                 <signal pad-id="pa2" function="USART" group="RXD" field="U0MAP"/>
@@ -210,17 +210,17 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa4" function="TWI" group="SCL"/>
                 <signal pad-id="pa6" function="TWI" group="SDA"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -238,7 +238,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa1" index="0" function="ACIN0" group="AIN0"/>
                 <signal pad-id="pa2" index="1" function="ACIN0" group="AIN0"/>
@@ -249,10 +249,10 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa1" index="0" function="OC" group="TOCC"/>
                 <signal pad-id="pa2" index="1" function="OC" group="TOCC"/>
@@ -269,7 +269,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc16">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 16-bit" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa1" index="0" function="OC" group="TOCC"/>
                 <signal pad-id="pa2" index="1" function="OC" group="TOCC"/>
@@ -286,7 +286,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa1" index="0" function="OC" group="TOCC"/>
                 <signal pad-id="pa2" index="0" function="OC" group="TOCC"/>
@@ -302,7 +302,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="EXTINT" group="PCINT"/>
                 <signal pad-id="pa1" index="1" function="EXTINT" group="PCINT"/>
@@ -320,13 +320,13 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tocpm" name="TOCPM" module-key="tocpm">
-            <register-group-instance key="tocpm" name="TOCPM" description="Timer/Counter Output Compare Pin" register-group-key="tocpm" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter Output Compare Pin" register-group-key="tocpm" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" function="SPI_ALT" group="MISO" field="SPIMAP"/>
                 <signal pad-id="pa1" function="SPI_ALT" group="MOSI" field="SPIMAP"/>
@@ -339,10 +339,10 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY44A.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY44A.xml
index 185d264d..eea4ed29 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY44A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY44A.xml
@@ -168,7 +168,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -181,7 +181,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -190,14 +190,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa1" index="0" function="ACIN" group="AIN"/>
                 <signal pad-id="pa2" index="1" function="ACIN" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -211,7 +211,7 @@
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa4" function="TWI" group="SCL"/>
                 <signal pad-id="pa6" function="TWI" group="SDA"/>
@@ -221,7 +221,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="EXTINT" group="PCINT"/>
                 <signal pad-id="pa1" index="1" function="EXTINT" group="PCINT"/>
@@ -239,13 +239,13 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa3" function="T0" group="T0"/>
                 <signal pad-id="pa7" function="T0" group="OC0B"/>
@@ -253,7 +253,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa4" function="T1" group="T1"/>
                 <signal pad-id="pa5" function="T1" group="OC1B"/>
@@ -262,16 +262,16 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY45.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY45.xml
index 11c0a974..efa02b1f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY45.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY45.xml
@@ -168,7 +168,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -179,14 +179,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" index="1" function="ACIN" group="AIN"/>
                 <signal pad-id="pb0" index="0" function="ACIN" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb5" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pb2" index="1" function="ADC" group="ADC"/>
@@ -195,7 +195,7 @@
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="TWI" group="SDA"/>
                 <signal pad-id="pb2" function="TWI" group="SCL"/>
@@ -205,7 +205,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="EXTINT" group="PCINT"/>
                 <signal pad-id="pb1" index="1" function="EXTINT" group="PCINT"/>
@@ -217,13 +217,13 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" function="T0" group="T0"/>
                 <signal pad-id="pb1" function="T0" group="OC0B"/>
@@ -231,7 +231,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc8">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 8-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb4" function="T1" group="OC1B"/>
                 <signal pad-id="pb3" function="T1" group="OC1BINV"/>
@@ -240,16 +240,16 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY461.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY461.xml
index a28e22bf..5b6fcae2 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY461.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY461.xml
@@ -196,7 +196,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -209,7 +209,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -222,7 +222,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -239,7 +239,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="ACIN" group="AIN"/>
                 <signal pad-id="pa6" index="1" function="ACIN" group="AIN"/>
@@ -247,7 +247,7 @@
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="USI" group="SDA" field="USIPOS"/>
                 <signal pad-id="pb2" function="USI" group="SCL" field="USIPOS"/>
@@ -262,20 +262,20 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa4" function="T0" group="ICP0"/>
                 <signal pad-id="pb6" function="T0" group="T0"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc8">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 8-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="T1" group="OC1AINV"/>
                 <signal pad-id="pb1" function="T1" group="OC1A"/>
@@ -286,10 +286,10 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="EXTINT" group="PCINT"/>
                 <signal pad-id="pa1" index="1" function="EXTINT" group="PCINT"/>
@@ -312,13 +312,13 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY461A.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY461A.xml
index c1924330..5174d17c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY461A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY461A.xml
@@ -196,7 +196,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -209,7 +209,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -222,40 +222,40 @@
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc8">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 8-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY48.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY48.xml
index 81199bfc..af5c49ff 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY48.xml
@@ -196,7 +196,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd5" group="T"/>
                 <signal pad-id="pb0" group="ICP"/>
@@ -205,14 +205,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd6" index="0" group="AIN"/>
                 <signal pad-id="pd7" index="1" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -225,7 +225,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -238,7 +238,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -251,7 +251,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -260,7 +260,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb5" group="SCK"/>
                 <signal pad-id="pb4" group="MISO"/>
@@ -269,20 +269,20 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc6" group="SCL"/>
                 <signal pad-id="pc5" group="SDA"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" group="ADC"/>
                 <signal pad-id="pc1" index="1" group="ADC"/>
@@ -295,7 +295,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" group="PCINT"/>
                 <signal pad-id="pb1" index="1" group="PCINT"/>
@@ -330,19 +330,19 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd4" group="T"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY804.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY804.xml
index cce7a094..7d7e2da8 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY804.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY804.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="AC0" group="N"/>
                 <signal pad-id="pa5" index="0" function="AC0" group="OUT"/>
@@ -50,7 +50,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pa1" index="1" function="AIN0" group="AIN"/>
@@ -65,10 +65,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="i2128">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN"/>
@@ -78,7 +78,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2603_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa3" function="CLKCTRL" group="CLKI"/>
                 <signal pad-id="pb3" function="CLKCTRL" group="TOSC1"/>
@@ -86,19 +86,19 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
                 <signal pad-id="pa1" function="BREAK" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="i2122">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2603_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
                 <signal pad-id="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
@@ -129,19 +129,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2603_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="i2603_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i2603_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="i2109">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -154,7 +154,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -163,25 +163,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2603_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="i2603_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="i2112">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="i2107">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
                 <signal pad-id="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
@@ -190,13 +190,13 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2603_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
                 <signal pad-id="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
@@ -208,20 +208,20 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x810"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x810"/>
             <signals>
                 <signal pad-id="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
                 <signal pad-id="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
                 <signal pad-id="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
@@ -234,22 +234,22 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="i2103_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="i2103_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="i2103_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="i2603_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i2127">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY806.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY806.xml
index f701ed12..e5f302f9 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY806.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY806.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="AC0" group="N"/>
                 <signal pad-id="pb4" index="1" function="AC0" group="N"/>
@@ -52,7 +52,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pa1" index="1" function="AIN0" group="AIN"/>
@@ -69,10 +69,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="i2128">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN"/>
@@ -85,7 +85,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2603_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa3" function="CLKCTRL" group="CLKI"/>
                 <signal pad-id="pb5" function="CLKCTRL" group="CLKO"/>
@@ -94,19 +94,19 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
                 <signal pad-id="pa1" function="BREAK" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="i2122">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2603_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
                 <signal pad-id="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
@@ -150,19 +150,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2603_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="i2603_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i2603_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="i2109">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -175,7 +175,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -186,7 +186,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -195,25 +195,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2603_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="i2603_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="i2112">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="i2107">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
                 <signal pad-id="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
@@ -226,13 +226,13 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2603_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
                 <signal pad-id="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
@@ -247,21 +247,21 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.CTRLD.TCB0"/>
                 <signal pad-id="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x810"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x810"/>
             <signals>
                 <signal pad-id="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
                 <signal pad-id="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
                 <signal pad-id="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
@@ -274,22 +274,22 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="i2103_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="i2103_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="i2103_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="i2603_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i2127">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY807.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY807.xml
index e475a4b4..086084df 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY807.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY807.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="AC0" group="N"/>
                 <signal pad-id="pb4" index="1" function="AC0" group="N"/>
@@ -52,7 +52,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pa1" index="1" function="AIN0" group="AIN"/>
@@ -69,10 +69,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="i2128">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN"/>
@@ -87,7 +87,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2603_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa3" function="CLKCTRL" group="CLKI"/>
                 <signal pad-id="pb5" function="CLKCTRL" group="CLKO"/>
@@ -96,20 +96,20 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
                 <signal pad-id="pc4" function="BREAK_ALT" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
                 <signal pad-id="pa1" function="BREAK" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="i2122">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2603_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
                 <signal pad-id="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
@@ -161,19 +161,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2603_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="i2603_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i2603_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="i2109">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -186,7 +186,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -199,7 +199,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -210,25 +210,25 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2603_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="i2603_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="i2112">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="i2107">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
                 <signal pad-id="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
@@ -241,13 +241,13 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2603_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
                 <signal pad-id="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
@@ -264,21 +264,21 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.CTRLD.TCB0"/>
                 <signal pad-id="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x810"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x810"/>
             <signals>
                 <signal pad-id="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
                 <signal pad-id="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
                 <signal pad-id="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
@@ -291,22 +291,22 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="i2103_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="i2103_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="i2103_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="i2603_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i2127">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY814.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY814.xml
index 0668a97f..05a339c9 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY814.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY814.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x670"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x670"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="AC0" group="N"/>
                 <signal pad-id="pa5" index="0" function="AC0" group="OUT"/>
@@ -50,7 +50,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pa1" index="1" function="AIN0" group="AIN"/>
@@ -65,10 +65,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="i2128">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN"/>
@@ -78,7 +78,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2600_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa3" function="CLKCTRL" group="CLKI"/>
                 <signal pad-id="pb3" function="CLKCTRL" group="TOSC1"/>
@@ -86,25 +86,25 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
                 <signal pad-id="pa1" function="BREAK" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="i2122">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="i2121">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2600_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
                 <signal pad-id="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
@@ -135,19 +135,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2600_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="i2600_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i2600_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="i2109">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -160,7 +160,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -169,7 +169,7 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2600_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="i2120">
             <signals>
@@ -189,22 +189,22 @@
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="i2600_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="i2112">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="i2107">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
                 <signal pad-id="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
@@ -213,13 +213,13 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2600_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
                 <signal pad-id="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
@@ -231,20 +231,20 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i2129">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xA80"/>
             <signals>
                 <signal pad-id="pa4" function="TCD0" group="WOA"/>
                 <signal pad-id="pa5" function="TCD0" group="WOB"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x810"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x810"/>
             <signals>
                 <signal pad-id="pa2" function="TWI0_ALT" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
                 <signal pad-id="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
@@ -253,7 +253,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
                 <signal pad-id="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
@@ -266,22 +266,22 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2600_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="i2103_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="i2103_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="i2103_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="i2600_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i2127">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY816.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY816.xml
index 695a81c3..62259245 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY816.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY816.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x670"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x670"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="AC0" group="N"/>
                 <signal pad-id="pb4" index="1" function="AC0" group="N"/>
@@ -52,7 +52,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pa1" index="1" function="AIN0" group="AIN"/>
@@ -69,10 +69,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="i2128">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN"/>
@@ -85,7 +85,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2600_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa3" function="CLKCTRL" group="CLKI"/>
                 <signal pad-id="pb5" function="CLKCTRL" group="CLKO"/>
@@ -94,25 +94,25 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
                 <signal pad-id="pa1" function="BREAK" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="i2122">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="i2121">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2600_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
                 <signal pad-id="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
@@ -156,19 +156,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2600_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="i2600_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i2600_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="i2109">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -181,7 +181,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -192,7 +192,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -201,7 +201,7 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2600_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="i2120">
             <signals>
@@ -222,22 +222,22 @@
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="i2600_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="i2112">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="i2107">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
                 <signal pad-id="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
@@ -250,13 +250,13 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2600_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
                 <signal pad-id="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
@@ -271,14 +271,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.CTRLD.TCB0"/>
                 <signal pad-id="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i2129">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xA80"/>
             <signals>
                 <signal pad-id="pa4" function="TCD0" group="WOA"/>
                 <signal pad-id="pa5" function="TCD0" group="WOB"/>
@@ -287,7 +287,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x810"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x810"/>
             <signals>
                 <signal pad-id="pa2" function="TWI0_ALT" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
                 <signal pad-id="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
@@ -296,7 +296,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
                 <signal pad-id="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
@@ -309,22 +309,22 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2600_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="i2103_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="i2103_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="i2103_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="i2600_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i2127">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY817.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY817.xml
index e5b7eaa0..610776bf 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY817.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY817.xml
@@ -42,7 +42,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">
-            <register-group-instance key="ac0" name="AC0" register-group-key="ac" address-space-key="data" offset="0x670"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x670"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="AC0" group="N"/>
                 <signal pad-id="pb4" index="1" function="AC0" group="N"/>
@@ -52,7 +52,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
-            <register-group-instance key="adc0" name="ADC0" register-group-key="adc" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AIN0" group="AIN"/>
                 <signal pad-id="pa1" index="1" function="AIN0" group="AIN"/>
@@ -69,10 +69,10 @@
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
-            <register-group-instance key="bod" name="BOD" register-group-key="bod" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="bod" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="ccl" name="CCL" module-key="i2128">
-            <register-group-instance key="ccl" name="CCL" register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="ccl" address-space-key="data" offset="0x1C0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="CCL" group="LUT0_IN"/>
                 <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN"/>
@@ -87,7 +87,7 @@
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2600_clkctrl">
-            <register-group-instance key="clkctrl" name="CLKCTRL" register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
                 <signal pad-id="pa3" function="CLKCTRL" group="CLKI"/>
                 <signal pad-id="pb5" function="CLKCTRL" group="CLKO"/>
@@ -96,26 +96,26 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
                 <signal pad-id="pc4" function="BREAK_ALT" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
                 <signal pad-id="pa1" function="BREAK" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
-            <register-group-instance key="cpuint" name="CPUINT" register-group-key="cpuint" address-space-key="data" offset="0x110"/>
+            <register-group-instance register-group-key="cpuint" address-space-key="data" offset="0x110"/>
         </peripheral>
         <peripheral key="crcscan" name="CRCSCAN" module-key="i2122">
-            <register-group-instance key="crcscan" name="CRCSCAN" register-group-key="crcscan" address-space-key="data" offset="0x120"/>
+            <register-group-instance register-group-key="crcscan" address-space-key="data" offset="0x120"/>
         </peripheral>
         <peripheral key="dac0" name="DAC0" module-key="i2121">
-            <register-group-instance key="dac0" name="DAC0" register-group-key="dac" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pa6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2600_evsys">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
                 <signal pad-id="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
@@ -167,19 +167,19 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2600_fuse">
-            <register-group-instance key="fuse" name="FUSE" register-group-key="fuse" address-space-key="data" offset="0x1280"/>
+            <register-group-instance register-group-key="fuse" address-space-key="data" offset="0x1280"/>
         </peripheral>
         <peripheral key="gpio" name="GPIO" module-key="i2600_gpio">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i2600_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
+            <register-group-instance register-group-key="lockbit" address-space-key="data" offset="0x128A"/>
         </peripheral>
         <peripheral key="nvmctrl" name="NVMCTRL" module-key="i2109">
-            <register-group-instance key="nvmctrl" name="NVMCTRL" register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
+            <register-group-instance register-group-key="nvmctrl" address-space-key="data" offset="0x1000"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x400"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pa1" index="1" function="IOPORT" group="PIN"/>
@@ -192,7 +192,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x420"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pb1" index="1" function="IOPORT" group="PIN"/>
@@ -205,7 +205,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="IOPORT" group="PIN"/>
                 <signal pad-id="pc1" index="1" function="IOPORT" group="PIN"/>
@@ -216,7 +216,7 @@
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2600_portmux">
-            <register-group-instance key="portmux" name="PORTMUX" register-group-key="portmux" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="portmux" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="i2120">
             <signals>
@@ -237,22 +237,22 @@
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
-            <register-group-instance key="rstctrl" name="RSTCTRL" register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x140"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x140"/>
         </peripheral>
         <peripheral key="sigrow" name="SIGROW" module-key="i2600_sigrow">
-            <register-group-instance key="sigrow" name="SIGROW" register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
+            <register-group-instance register-group-key="sigrow" address-space-key="data" offset="0x1100"/>
         </peripheral>
         <peripheral key="slpctrl" name="SLPCTRL" module-key="i2112">
-            <register-group-instance key="slpctrl" name="SLPCTRL" register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="slpctrl" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="i2107">
-            <register-group-instance key="spi0" name="SPI0" register-group-key="spi" address-space-key="data" offset="0x820"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x820"/>
             <signals>
                 <signal pad-id="pc1" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
                 <signal pad-id="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
@@ -265,13 +265,13 @@
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2600_syscfg">
-            <register-group-instance key="syscfg" name="SYSCFG" register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
+            <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
                 <signal pad-id="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
-            <register-group-instance key="tca0" name="TCA0" register-group-key="tca" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tca" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
                 <signal pad-id="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
@@ -288,14 +288,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
-            <register-group-instance key="tcb0" name="TCB0" register-group-key="tcb" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.CTRLD.TCB0"/>
                 <signal pad-id="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i2129">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tcd" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="tcd" address-space-key="data" offset="0xA80"/>
             <signals>
                 <signal pad-id="pa4" function="TCD0" group="WOA"/>
                 <signal pad-id="pa5" function="TCD0" group="WOB"/>
@@ -304,7 +304,7 @@
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
-            <register-group-instance key="twi0" name="TWI0" register-group-key="twi" address-space-key="data" offset="0x810"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x810"/>
             <signals>
                 <signal pad-id="pa2" function="TWI0_ALT" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
                 <signal pad-id="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
@@ -313,7 +313,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
-            <register-group-instance key="usart0" name="USART0" register-group-key="usart" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
                 <signal pad-id="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
@@ -326,22 +326,22 @@
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2600_userrow">
-            <register-group-instance key="userrow" name="USERROW" register-group-key="userrow" address-space-key="data" offset="0x1300"/>
+            <register-group-instance register-group-key="userrow" address-space-key="data" offset="0x1300"/>
         </peripheral>
         <peripheral key="vporta" name="VPORTA" module-key="i2103_vport">
-            <register-group-instance key="vporta" name="VPORTA" register-group-key="vport" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vportb" name="VPORTB" module-key="i2103_vport">
-            <register-group-instance key="vportb" name="VPORTB" register-group-key="vport" address-space-key="data" offset="0x4"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x4"/>
         </peripheral>
         <peripheral key="vportc" name="VPORTC" module-key="i2103_vport">
-            <register-group-instance key="vportc" name="VPORTC" register-group-key="vport" address-space-key="data" offset="0x8"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x8"/>
         </peripheral>
         <peripheral key="vref" name="VREF" module-key="i2600_vref">
-            <register-group-instance key="vref" name="VREF" register-group-key="vref" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="vref" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i2127">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x100"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY828.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY828.xml
index 9dda09b4..0558621d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY828.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY828.xml
@@ -170,10 +170,10 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -186,7 +186,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -199,7 +199,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -212,7 +212,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -221,43 +221,43 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tocpm" name="TOCPM" module-key="tocpm">
-            <register-group-instance key="tocpm" name="TOCPM" description="Timer/Counter Output Compare Pin" register-group-key="tocpm" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter Output Compare Pin" register-group-key="tocpm" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usart" name="USART" module-key="usart">
-            <register-group-instance key="usart" name="USART" description="USART" register-group-key="usart" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY84.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY84.xml
index 188e6814..b3f00176 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY84.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY84.xml
@@ -168,7 +168,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -181,7 +181,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -190,40 +190,40 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY841.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY841.xml
index 6a854ab3..661d92aa 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY841.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY841.xml
@@ -169,7 +169,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -178,7 +178,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -191,7 +191,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
-            <register-group-instance key="usart1" name="USART1" description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa4" function="USART" group="RXD"/>
                 <signal pad-id="pa5" function="USART" group="TXD"/>
@@ -199,7 +199,7 @@
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
-            <register-group-instance key="usart0" name="USART0" description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="USART" register-group-key="usart0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa1" function="USART" group="TXD" field="U0MAP"/>
                 <signal pad-id="pa2" function="USART" group="RXD" field="U0MAP"/>
@@ -210,17 +210,17 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa4" function="TWI" group="SCL"/>
                 <signal pad-id="pa6" function="TWI" group="SDA"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -238,7 +238,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa1" index="0" function="ACIN0" group="AIN0"/>
                 <signal pad-id="pa2" index="1" function="ACIN0" group="AIN0"/>
@@ -249,10 +249,10 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa1" index="0" function="OC" group="TOCC"/>
                 <signal pad-id="pa2" index="1" function="OC" group="TOCC"/>
@@ -269,7 +269,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc16">
-            <register-group-instance key="tc2" name="TC2" description="Timer/Counter, 16-bit" register-group-key="tc2" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc2" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa1" index="0" function="OC" group="TOCC"/>
                 <signal pad-id="pa2" index="1" function="OC" group="TOCC"/>
@@ -286,7 +286,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa1" index="0" function="OC" group="TOCC"/>
                 <signal pad-id="pa2" index="0" function="OC" group="TOCC"/>
@@ -302,7 +302,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="EXTINT" group="PCINT"/>
                 <signal pad-id="pa1" index="1" function="EXTINT" group="PCINT"/>
@@ -320,13 +320,13 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tocpm" name="TOCPM" module-key="tocpm">
-            <register-group-instance key="tocpm" name="TOCPM" description="Timer/Counter Output Compare Pin" register-group-key="tocpm" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter Output Compare Pin" register-group-key="tocpm" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" function="SPI_ALT" group="MISO" field="SPIMAP"/>
                 <signal pad-id="pa1" function="SPI_ALT" group="MOSI" field="SPIMAP"/>
@@ -339,10 +339,10 @@
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY84A.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY84A.xml
index 8758b10b..6bb14b27 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY84A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY84A.xml
@@ -168,7 +168,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -181,7 +181,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -190,14 +190,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa1" index="0" function="ACIN" group="AIN"/>
                 <signal pad-id="pa2" index="1" function="ACIN" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -211,7 +211,7 @@
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa4" function="TWI" group="SCL"/>
                 <signal pad-id="pa6" function="TWI" group="SDA"/>
@@ -221,7 +221,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="EXTINT" group="PCINT"/>
                 <signal pad-id="pa1" index="1" function="EXTINT" group="PCINT"/>
@@ -239,13 +239,13 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa3" function="T0" group="T0"/>
                 <signal pad-id="pa7" function="T0" group="OC0B"/>
@@ -253,7 +253,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa4" function="T1" group="T1"/>
                 <signal pad-id="pa5" function="T1" group="OC1B"/>
@@ -262,16 +262,16 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY85.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY85.xml
index 251de6ad..fb09d5b8 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY85.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY85.xml
@@ -168,7 +168,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -179,14 +179,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb1" index="1" function="ACIN" group="AIN"/>
                 <signal pad-id="pb0" index="0" function="ACIN" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb5" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pb2" index="1" function="ADC" group="ADC"/>
@@ -195,7 +195,7 @@
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="TWI" group="SDA"/>
                 <signal pad-id="pb2" function="TWI" group="SCL"/>
@@ -205,7 +205,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="EXTINT" group="PCINT"/>
                 <signal pad-id="pb1" index="1" function="EXTINT" group="PCINT"/>
@@ -217,13 +217,13 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb2" function="T0" group="T0"/>
                 <signal pad-id="pb1" function="T0" group="OC0B"/>
@@ -231,7 +231,7 @@
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb4" function="T1" group="OC1B"/>
                 <signal pad-id="pb3" function="T1" group="OC1BINV"/>
@@ -240,16 +240,16 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY861.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY861.xml
index 6aba2103..0c5fe76c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY861.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY861.xml
@@ -196,7 +196,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -209,7 +209,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -222,7 +222,7 @@
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -239,7 +239,7 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa7" index="0" function="ACIN" group="AIN"/>
                 <signal pad-id="pa6" index="1" function="ACIN" group="AIN"/>
@@ -247,7 +247,7 @@
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="USI" group="SDA" field="USIPOS"/>
                 <signal pad-id="pb2" function="USI" group="SCL" field="USIPOS"/>
@@ -262,20 +262,20 @@
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa4" function="T0" group="ICP0"/>
                 <signal pad-id="pb6" function="T0" group="T0"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" function="T1" group="OC1AINV"/>
                 <signal pad-id="pb1" function="T1" group="OC1A"/>
@@ -286,10 +286,10 @@
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="EXTINT" group="PCINT"/>
                 <signal pad-id="pa1" index="1" function="EXTINT" group="PCINT"/>
@@ -312,13 +312,13 @@
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY861A.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY861A.xml
index b96c6187..29bea023 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY861A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY861A.xml
@@ -196,7 +196,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -209,7 +209,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -222,40 +222,40 @@
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY87.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY87.xml
index 25fe8c04..b2edf523 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY87.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY87.xml
@@ -170,7 +170,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -183,7 +183,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -196,49 +196,49 @@
             </signals>
         </peripheral>
         <peripheral key="linuart" name="LINUART" module-key="linuart">
-            <register-group-instance key="linuart" name="LINUART" description="Local Interconnect Network" register-group-key="linuart" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Local Interconnect Network" register-group-key="linuart" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
-            <register-group-instance key="usi" name="USI" description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Universal Serial Interface" register-group-key="usi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8_async">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit Async" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit Async" register-group-key="tc0" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="current_source" name="CURRENT_SOURCE" module-key="current_source">
-            <register-group-instance key="current_source" name="CURRENT_SOURCE" description="Current Source" register-group-key="current_source" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Current Source" register-group-key="current_source" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
-            <register-group-instance key="boot_load" name="BOOT_LOAD" description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Bootloader" register-group-key="boot_load" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY88.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY88.xml
index 34643d83..135573cb 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY88.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY88.xml
@@ -196,7 +196,7 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc1" name="TC1" module-key="tc16">
-            <register-group-instance key="tc1" name="TC1" description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 16-bit" register-group-key="tc1" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd5" group="T"/>
                 <signal pad-id="pb0" group="ICP"/>
@@ -205,14 +205,14 @@
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
-            <register-group-instance key="ac" name="AC" description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog Comparator" register-group-key="ac" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd6" index="0" group="AIN"/>
                 <signal pad-id="pd7" index="1" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portb" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="default" group="P"/>
                 <signal pad-id="pb1" index="1" function="default" group="P"/>
@@ -225,7 +225,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portd" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="default" group="P"/>
                 <signal pad-id="pd1" index="1" function="default" group="P"/>
@@ -238,7 +238,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="portc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="default" group="P"/>
                 <signal pad-id="pc1" index="1" function="default" group="P"/>
@@ -251,7 +251,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="I/O Port" register-group-key="porta" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="default" group="P"/>
                 <signal pad-id="pa1" index="1" function="default" group="P"/>
@@ -260,7 +260,7 @@
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
-            <register-group-instance key="spi" name="SPI" description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Serial Peripheral Interface" register-group-key="spi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb5" group="SCK"/>
                 <signal pad-id="pb4" group="MISO"/>
@@ -269,17 +269,17 @@
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
-            <register-group-instance key="wdt" name="WDT" description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Watchdog Timer" register-group-key="wdt" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
-            <register-group-instance key="twi" name="TWI" description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Two Wire Serial Interface" register-group-key="twi" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc6" group="SCL"/>
                 <signal pad-id="pc5" group="SDA"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
-            <register-group-instance key="adc" name="ADC" description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Analog-to-Digital Converter" register-group-key="adc" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pc0" index="0" group="ADC"/>
                 <signal pad-id="pc1" index="1" group="ADC"/>
@@ -292,7 +292,7 @@
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
-            <register-group-instance key="exint" name="EXINT" description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="External Interrupts" register-group-key="exint" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pb0" index="0" group="PCINT"/>
                 <signal pad-id="pb1" index="1" group="PCINT"/>
@@ -327,22 +327,22 @@
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
-            <register-group-instance key="tc0" name="TC0" description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="Timer/Counter, 8-bit" register-group-key="tc0" address-space-key="data" offset="0x0"/>
             <signals>
                 <signal pad-id="pd4" group="T"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
-            <register-group-instance key="cpu" name="CPU" description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="CPU Registers" register-group-key="cpu" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
-            <register-group-instance key="eeprom" name="EEPROM" description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
+            <register-group-instance description="EEPROM" register-group-key="eeprom" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
-            <register-group-instance key="fuse" name="FUSE" description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
+            <register-group-instance description="Fuses" register-group-key="fuse" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance description="Lockbits" register-group-key="lockbit" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1.xml
index f69d2a1b..c9039d36 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1.xml
@@ -63,115 +63,115 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="dma" name="DMA" module-key="i3000">
-            <register-group-instance key="dma" name="DMA" register-group-key="dma" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="dma" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076-revh">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6076-revh">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6076-revh">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i6076-revh">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
         </peripheral>
         <peripheral key="acb" name="ACB" module-key="i6077">
-            <register-group-instance key="acb" name="ACB" register-group-key="ac" address-space-key="data" offset="0x390"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x390"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6064">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="adcb" name="ADCB" module-key="i6064">
-            <register-group-instance key="adcb" name="ADCB" register-group-key="adc" address-space-key="data" offset="0x240"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x240"/>
         </peripheral>
         <peripheral key="daca" name="DACA" module-key="i6059">
-            <register-group-instance key="daca" name="DACA" register-group-key="dac" address-space-key="data" offset="0x300"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x300"/>
         </peripheral>
         <peripheral key="dacb" name="DACB" module-key="i6059">
-            <register-group-instance key="dacb" name="DACB" register-group-key="dac" address-space-key="data" offset="0x320"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x320"/>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="ebi" name="EBI" module-key="i3001">
-            <register-group-instance key="ebi" name="EBI" register-group-key="ebi" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="ebi" address-space-key="data" offset="0x440"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
         </peripheral>
         <peripheral key="twid" name="TWID" module-key="i6089">
-            <register-group-instance key="twid" name="TWID" register-group-key="twi" address-space-key="data" offset="0x490"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x490"/>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
         </peripheral>
         <peripheral key="twif" name="TWIF" module-key="i6089">
-            <register-group-instance key="twif" name="TWIF" register-group-key="twi" address-space-key="data" offset="0x4B0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4B0"/>
         </peripheral>
         <peripheral key="port_cfg" name="PORT_CFG" module-key="gpio_port">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="gpio_port">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="gpio_port">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="gpio_port">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="gpio_port">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -184,7 +184,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -197,7 +197,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -210,7 +210,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -223,7 +223,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -236,7 +236,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -249,7 +249,7 @@
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
-            <register-group-instance key="porth" name="PORTH" register-group-key="port" address-space-key="data" offset="0x6E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6E0"/>
             <signals>
                 <signal pad-id="ph0" index="0" function="PORTH" group="P"/>
                 <signal pad-id="ph1" index="1" function="PORTH" group="P"/>
@@ -262,7 +262,7 @@
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
-            <register-group-instance key="portj" name="PORTJ" register-group-key="port" address-space-key="data" offset="0x700"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x700"/>
             <signals>
                 <signal pad-id="pj0" index="0" function="PORTJ" group="P"/>
                 <signal pad-id="pj1" index="1" function="PORTJ" group="P"/>
@@ -275,7 +275,7 @@
             </signals>
         </peripheral>
         <peripheral key="portk" name="PORTK" module-key="gpio_port">
-            <register-group-instance key="portk" name="PORTK" register-group-key="port" address-space-key="data" offset="0x720"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x720"/>
             <signals>
                 <signal pad-id="pk0" index="0" function="PORTK" group="P"/>
                 <signal pad-id="pk1" index="1" function="PORTK" group="P"/>
@@ -288,7 +288,7 @@
             </signals>
         </peripheral>
         <peripheral key="portq" name="PORTQ" module-key="gpio_port">
-            <register-group-instance key="portq" name="PORTQ" register-group-key="port" address-space-key="data" offset="0x7C0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7C0"/>
             <signals>
                 <signal pad-id="pq0" index="0" function="PORTQ" group="P"/>
                 <signal pad-id="pq1" index="1" function="PORTQ" group="P"/>
@@ -297,95 +297,95 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_tc">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_tc">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
         </peripheral>
         <peripheral key="tcd1" name="TCD1" module-key="i6090_tc">
-            <register-group-instance key="tcd1" name="TCD1" register-group-key="tc1" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x940"/>
         </peripheral>
         <peripheral key="hiresd" name="HIRESD" module-key="i6090_tc">
-            <register-group-instance key="hiresd" name="HIRESD" register-group-key="hires" address-space-key="data" offset="0x990"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x990"/>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
         </peripheral>
         <peripheral key="tce1" name="TCE1" module-key="i6090_tc">
-            <register-group-instance key="tce1" name="TCE1" register-group-key="tc1" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0xA40"/>
         </peripheral>
         <peripheral key="awexe" name="AWEXE" module-key="i6090_tc">
-            <register-group-instance key="awexe" name="AWEXE" register-group-key="awex" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0xA80"/>
         </peripheral>
         <peripheral key="hirese" name="HIRESE" module-key="i6090_tc">
-            <register-group-instance key="hirese" name="HIRESE" register-group-key="hires" address-space-key="data" offset="0xA90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xA90"/>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
-            <register-group-instance key="tcf0" name="TCF0" register-group-key="tc0" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xB00"/>
         </peripheral>
         <peripheral key="tcf1" name="TCF1" module-key="i6090_tc">
-            <register-group-instance key="tcf1" name="TCF1" register-group-key="tc1" address-space-key="data" offset="0xB40"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0xB40"/>
         </peripheral>
         <peripheral key="hiresf" name="HIRESF" module-key="i6090_tc">
-            <register-group-instance key="hiresf" name="HIRESF" register-group-key="hires" address-space-key="data" offset="0xB90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xB90"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
-            <register-group-instance key="usartc1" name="USARTC1" register-group-key="usart" address-space-key="data" offset="0x8B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8B0"/>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
         </peripheral>
         <peripheral key="usartd1" name="USARTD1" module-key="i6090_usart">
-            <register-group-instance key="usartd1" name="USARTD1" register-group-key="usart" address-space-key="data" offset="0x9B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9B0"/>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
         </peripheral>
         <peripheral key="usarte1" name="USARTE1" module-key="i6090_usart">
-            <register-group-instance key="usarte1" name="USARTE1" register-group-key="usart" address-space-key="data" offset="0xAB0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAB0"/>
         </peripheral>
         <peripheral key="usartf0" name="USARTF0" module-key="i6090_usart">
-            <register-group-instance key="usartf0" name="USARTF0" register-group-key="usart" address-space-key="data" offset="0xBA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xBA0"/>
         </peripheral>
         <peripheral key="usartf1" name="USARTF1" module-key="i6090_usart">
-            <register-group-instance key="usartf1" name="USARTF1" register-group-key="usart" address-space-key="data" offset="0xBB0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xBB0"/>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
         </peripheral>
         <peripheral key="spie" name="SPIE" module-key="i6090_spi">
-            <register-group-instance key="spie" name="SPIE" register-group-key="spi" address-space-key="data" offset="0xAC0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0xAC0"/>
         </peripheral>
         <peripheral key="spif" name="SPIF" module-key="i6090_spi">
-            <register-group-instance key="spif" name="SPIF" register-group-key="spi" address-space-key="data" offset="0xBC0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0xBC0"/>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
-            <register-group-instance key="aes" name="AES" register-group-key="aes" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="aes" address-space-key="data" offset="0xC0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1U.xml
index 658116f9..8949c673 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1U.xml
@@ -63,58 +63,58 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="i6075_vport">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="i6075_vport">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="i6075_vport">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="i6075_vport">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pc7" function="CLKOUTC" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pc4" function="CLKOUTC_ALT" group="CLKOUT" field="CLKEVPIN"/>
@@ -132,22 +132,22 @@
             </signals>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
-            <register-group-instance key="aes" name="AES" register-group-key="aes" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="aes" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="dma" name="DMA" module-key="i3000">
-            <register-group-instance key="dma" name="DMA" register-group-key="dma" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="dma" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6099">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADCPOS" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADCPOS" group="ADC"/>
@@ -186,7 +186,7 @@
             </signals>
         </peripheral>
         <peripheral key="adcb" name="ADCB" module-key="i6099">
-            <register-group-instance key="adcb" name="ADCB" register-group-key="adc" address-space-key="data" offset="0x240"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x240"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="ADCPOS" group="ADC"/>
                 <signal pad-id="pb1" index="1" function="ADCPOS" group="ADC"/>
@@ -217,7 +217,7 @@
             </signals>
         </peripheral>
         <peripheral key="daca" name="DACA" module-key="i6059">
-            <register-group-instance key="daca" name="DACA" register-group-key="dac" address-space-key="data" offset="0x300"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x300"/>
             <signals>
                 <signal pad-id="pa2" index="0" function="DAC" group="DAC"/>
                 <signal pad-id="pa3" index="1" function="DAC" group="DAC"/>
@@ -226,7 +226,7 @@
             </signals>
         </peripheral>
         <peripheral key="dacb" name="DACB" module-key="i6059">
-            <register-group-instance key="dacb" name="DACB" register-group-key="dac" address-space-key="data" offset="0x320"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x320"/>
             <signals>
                 <signal pad-id="pb2" index="0" function="DAC" group="DAC"/>
                 <signal pad-id="pb3" index="1" function="DAC" group="DAC"/>
@@ -235,7 +235,7 @@
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ACPOS" group="AC"/>
                 <signal pad-id="pa1" index="1" function="ACPOS" group="AC"/>
@@ -254,7 +254,7 @@
             </signals>
         </peripheral>
         <peripheral key="acb" name="ACB" module-key="i6077">
-            <register-group-instance key="acb" name="ACB" register-group-key="ac" address-space-key="data" offset="0x390"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x390"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="ACPOS" group="AC"/>
                 <signal pad-id="pb1" index="1" function="ACPOS" group="AC"/>
@@ -273,10 +273,10 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="ebi" name="EBI" module-key="i3001">
-            <register-group-instance key="ebi" name="EBI" register-group-key="ebi" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="ebi" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="ph0" index="0" function="EBIPORT0" group="PORT0"/>
                 <signal pad-id="ph1" index="1" function="EBIPORT0" group="PORT0"/>
@@ -313,42 +313,42 @@
             </signals>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWIC" group="SDA"/>
                 <signal pad-id="pc1" function="TWIC" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twid" name="TWID" module-key="i6089">
-            <register-group-instance key="twid" name="TWID" register-group-key="twi" address-space-key="data" offset="0x490"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x490"/>
             <signals>
                 <signal pad-id="pd0" function="TWID" group="SDA"/>
                 <signal pad-id="pd1" function="TWID" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pe0" function="TWIE" group="SDA"/>
                 <signal pad-id="pe1" function="TWIE" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twif" name="TWIF" module-key="i6089">
-            <register-group-instance key="twif" name="TWIF" register-group-key="twi" address-space-key="data" offset="0x4B0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4B0"/>
             <signals>
                 <signal pad-id="pf0" function="TWIF" group="SDA"/>
                 <signal pad-id="pf1" function="TWIF" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
-            <register-group-instance key="usb" name="USB" register-group-key="usb" address-space-key="data" offset="0x4C0"/>
+            <register-group-instance register-group-key="usb" address-space-key="data" offset="0x4C0"/>
             <signals>
                 <signal pad-id="pd6" function="USB" group="DN"/>
                 <signal pad-id="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -361,7 +361,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -374,7 +374,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -387,7 +387,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -400,7 +400,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -413,7 +413,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -426,7 +426,7 @@
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
-            <register-group-instance key="porth" name="PORTH" register-group-key="port" address-space-key="data" offset="0x6E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6E0"/>
             <signals>
                 <signal pad-id="ph0" index="0" function="PORTH" group="P"/>
                 <signal pad-id="ph1" index="1" function="PORTH" group="P"/>
@@ -439,7 +439,7 @@
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
-            <register-group-instance key="portj" name="PORTJ" register-group-key="port" address-space-key="data" offset="0x700"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x700"/>
             <signals>
                 <signal pad-id="pj0" index="0" function="PORTJ" group="P"/>
                 <signal pad-id="pj1" index="1" function="PORTJ" group="P"/>
@@ -452,7 +452,7 @@
             </signals>
         </peripheral>
         <peripheral key="portk" name="PORTK" module-key="gpio_port">
-            <register-group-instance key="portk" name="PORTK" register-group-key="port" address-space-key="data" offset="0x720"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x720"/>
             <signals>
                 <signal pad-id="pk0" index="0" function="PORTK" group="P"/>
                 <signal pad-id="pk1" index="1" function="PORTK" group="P"/>
@@ -465,7 +465,7 @@
             </signals>
         </peripheral>
         <peripheral key="portq" name="PORTQ" module-key="gpio_port">
-            <register-group-instance key="portq" name="PORTQ" register-group-key="port" address-space-key="data" offset="0x7C0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7C0"/>
             <signals>
                 <signal pad-id="pq0" index="0" function="PORTQ" group="P"/>
                 <signal pad-id="pq1" index="1" function="PORTQ" group="P"/>
@@ -474,14 +474,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TCC" group="OC0A"/>
                 <signal pad-id="pc1" function="TCC" group="OC0B"/>
@@ -494,14 +494,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TCC" group="OC1A"/>
                 <signal pad-id="pc5" function="TCC" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TCD" group="OC0A"/>
                 <signal pad-id="pd1" function="TCD" group="OC0B"/>
@@ -510,14 +510,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcd1" name="TCD1" module-key="i6090_tc">
-            <register-group-instance key="tcd1" name="TCD1" register-group-key="tc1" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pd4" function="TCD" group="OC1A"/>
                 <signal pad-id="pd5" function="TCD" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TCE0" group="OC0A"/>
                 <signal pad-id="pe1" function="TCE0" group="OC0B"/>
@@ -526,14 +526,14 @@
             </signals>
         </peripheral>
         <peripheral key="tce1" name="TCE1" module-key="i6090_tc">
-            <register-group-instance key="tce1" name="TCE1" register-group-key="tc1" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pe4" function="TCE1" group="OC1A"/>
                 <signal pad-id="pe5" function="TCE1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
-            <register-group-instance key="tcf0" name="TCF0" register-group-key="tc0" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TCF0" group="OC0A"/>
                 <signal pad-id="pf1" function="TCF0" group="OC0B"/>
@@ -542,14 +542,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcf1" name="TCF1" module-key="i6090_tc">
-            <register-group-instance key="tcf1" name="TCF1" register-group-key="tc1" address-space-key="data" offset="0xB40"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0xB40"/>
             <signals>
                 <signal pad-id="pf4" function="TCF1" group="OC1A"/>
                 <signal pad-id="pf5" function="TCF1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
-            <register-group-instance key="tcc2" name="TCC2" register-group-key="tc2" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TCC2" group="LOC2A"/>
                 <signal pad-id="pc1" function="TCC2" group="LOC2B"/>
@@ -562,7 +562,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
-            <register-group-instance key="tcd2" name="TCD2" register-group-key="tc2" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TCD2" group="LOC2A"/>
                 <signal pad-id="pd1" function="TCD2" group="LOC2B"/>
@@ -575,7 +575,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
-            <register-group-instance key="tce2" name="TCE2" register-group-key="tc2" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TCE2" group="LOC2A"/>
                 <signal pad-id="pe1" function="TCE2" group="LOC2B"/>
@@ -588,7 +588,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
-            <register-group-instance key="tcf2" name="TCF2" register-group-key="tc2" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TCF2" group="LOC2A"/>
                 <signal pad-id="pf1" function="TCF2" group="LOC2B"/>
@@ -601,7 +601,7 @@
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pc0" function="AWEXC" group="OC0ALS"/>
                 <signal pad-id="pc1" function="AWEXC" group="OC0AHS"/>
@@ -614,7 +614,7 @@
             </signals>
         </peripheral>
         <peripheral key="awexe" name="AWEXE" module-key="i6090_awex">
-            <register-group-instance key="awexe" name="AWEXE" register-group-key="awex" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0xA80"/>
             <signals>
                 <signal pad-id="pe0" function="AWEXE" group="OC0ALS"/>
                 <signal pad-id="pe1" function="AWEXE" group="OC0AHS"/>
@@ -627,19 +627,19 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="hiresd" name="HIRESD" module-key="i6090_hires">
-            <register-group-instance key="hiresd" name="HIRESD" register-group-key="hires" address-space-key="data" offset="0x990"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x990"/>
         </peripheral>
         <peripheral key="hirese" name="HIRESE" module-key="i6090_hires">
-            <register-group-instance key="hirese" name="HIRESE" register-group-key="hires" address-space-key="data" offset="0xA90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xA90"/>
         </peripheral>
         <peripheral key="hiresf" name="HIRESF" module-key="i6090_hires">
-            <register-group-instance key="hiresf" name="HIRESF" register-group-key="hires" address-space-key="data" offset="0xB90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xB90"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK"/>
                 <signal pad-id="pc2" function="USART" group="RXD"/>
@@ -650,7 +650,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
-            <register-group-instance key="usartc1" name="USARTC1" register-group-key="usart" address-space-key="data" offset="0x8B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8B0"/>
             <signals>
                 <signal pad-id="pc5" function="USART" group="XCK"/>
                 <signal pad-id="pc6" function="USART" group="RXD"/>
@@ -658,7 +658,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
             <signals>
                 <signal pad-id="pd1" function="USART" group="XCK"/>
                 <signal pad-id="pd2" function="USART" group="RXD"/>
@@ -666,7 +666,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd1" name="USARTD1" module-key="i6090_usart">
-            <register-group-instance key="usartd1" name="USARTD1" register-group-key="usart" address-space-key="data" offset="0x9B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9B0"/>
             <signals>
                 <signal pad-id="pd5" function="USART" group="XCK"/>
                 <signal pad-id="pd6" function="USART" group="RXD"/>
@@ -674,7 +674,7 @@
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
             <signals>
                 <signal pad-id="pe1" function="USART" group="XCK"/>
                 <signal pad-id="pe2" function="USART" group="RXD"/>
@@ -682,7 +682,7 @@
             </signals>
         </peripheral>
         <peripheral key="usarte1" name="USARTE1" module-key="i6090_usart">
-            <register-group-instance key="usarte1" name="USARTE1" register-group-key="usart" address-space-key="data" offset="0xAB0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAB0"/>
             <signals>
                 <signal pad-id="pe5" function="USART" group="XCK"/>
                 <signal pad-id="pe6" function="USART" group="RXD"/>
@@ -690,7 +690,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartf0" name="USARTF0" module-key="i6090_usart">
-            <register-group-instance key="usartf0" name="USARTF0" register-group-key="usart" address-space-key="data" offset="0xBA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xBA0"/>
             <signals>
                 <signal pad-id="pf1" function="USARTF0" group="XCK"/>
                 <signal pad-id="pf2" function="USARTF0" group="RXD"/>
@@ -698,7 +698,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartf1" name="USARTF1" module-key="i6090_usart">
-            <register-group-instance key="usartf1" name="USARTF1" register-group-key="usart" address-space-key="data" offset="0xBB0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xBB0"/>
             <signals>
                 <signal pad-id="pf5" function="USARTF1" group="XCK"/>
                 <signal pad-id="pf6" function="USARTF1" group="RXD"/>
@@ -706,7 +706,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc4" function="SPIC" group="SS"/>
                 <signal pad-id="pc5" function="SPIC" group="MOSI"/>
@@ -715,7 +715,7 @@
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
             <signals>
                 <signal pad-id="pd4" function="SPID" group="SS"/>
                 <signal pad-id="pd5" function="SPID" group="MOSI"/>
@@ -724,7 +724,7 @@
             </signals>
         </peripheral>
         <peripheral key="spie" name="SPIE" module-key="i6090_spi">
-            <register-group-instance key="spie" name="SPIE" register-group-key="spi" address-space-key="data" offset="0xAC0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0xAC0"/>
             <signals>
                 <signal pad-id="pe4" function="SPIE" group="SS"/>
                 <signal pad-id="pe5" function="SPIE" group="MOSI"/>
@@ -733,7 +733,7 @@
             </signals>
         </peripheral>
         <peripheral key="spif" name="SPIF" module-key="i6090_spi">
-            <register-group-instance key="spif" name="SPIF" register-group-key="spi" address-space-key="data" offset="0xBC0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0xBC0"/>
             <signals>
                 <signal pad-id="pf4" function="SPIF" group="SS"/>
                 <signal pad-id="pf5" function="SPIF" group="MOSI"/>
@@ -742,16 +742,16 @@
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6570_fuse">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6570_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i6570_sigrow">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3.xml
index db12bc7e..6617d26d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3.xml
@@ -62,103 +62,103 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="dma" name="DMA" module-key="i3000">
-            <register-group-instance key="dma" name="DMA" register-group-key="dma" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="dma" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6076">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6076">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i6076">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
         </peripheral>
         <peripheral key="acb" name="ACB" module-key="i6077">
-            <register-group-instance key="acb" name="ACB" register-group-key="ac" address-space-key="data" offset="0x390"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x390"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6064">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="adcb" name="ADCB" module-key="i6064">
-            <register-group-instance key="adcb" name="ADCB" register-group-key="adc" address-space-key="data" offset="0x240"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x240"/>
         </peripheral>
         <peripheral key="dacb" name="DACB" module-key="i6059">
-            <register-group-instance key="dacb" name="DACB" register-group-key="dac" address-space-key="data" offset="0x320"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x320"/>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
         </peripheral>
         <peripheral key="port_cfg" name="PORT_CFG" module-key="gpio_port">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="gpio_port">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="gpio_port">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="gpio_port">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="gpio_port">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -171,7 +171,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -184,7 +184,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -197,7 +197,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -210,7 +210,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -223,7 +223,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -236,92 +236,92 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_tc">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_tc">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
         </peripheral>
         <peripheral key="tcd1" name="TCD1" module-key="i6090_tc">
-            <register-group-instance key="tcd1" name="TCD1" register-group-key="tc1" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x940"/>
         </peripheral>
         <peripheral key="hiresd" name="HIRESD" module-key="i6090_tc">
-            <register-group-instance key="hiresd" name="HIRESD" register-group-key="hires" address-space-key="data" offset="0x990"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x990"/>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
         </peripheral>
         <peripheral key="tce1" name="TCE1" module-key="i6090_tc">
-            <register-group-instance key="tce1" name="TCE1" register-group-key="tc1" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0xA40"/>
         </peripheral>
         <peripheral key="awexe" name="AWEXE" module-key="i6090_tc">
-            <register-group-instance key="awexe" name="AWEXE" register-group-key="awex" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0xA80"/>
         </peripheral>
         <peripheral key="hirese" name="HIRESE" module-key="i6090_tc">
-            <register-group-instance key="hirese" name="HIRESE" register-group-key="hires" address-space-key="data" offset="0xA90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xA90"/>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
-            <register-group-instance key="tcf0" name="TCF0" register-group-key="tc0" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xB00"/>
         </peripheral>
         <peripheral key="hiresf" name="HIRESF" module-key="i6090_tc">
-            <register-group-instance key="hiresf" name="HIRESF" register-group-key="hires" address-space-key="data" offset="0xB90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xB90"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
-            <register-group-instance key="usartc1" name="USARTC1" register-group-key="usart" address-space-key="data" offset="0x8B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8B0"/>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
         </peripheral>
         <peripheral key="usartd1" name="USARTD1" module-key="i6090_usart">
-            <register-group-instance key="usartd1" name="USARTD1" register-group-key="usart" address-space-key="data" offset="0x9B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9B0"/>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
         </peripheral>
         <peripheral key="usarte1" name="USARTE1" module-key="i6090_usart">
-            <register-group-instance key="usarte1" name="USARTE1" register-group-key="usart" address-space-key="data" offset="0xAB0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAB0"/>
         </peripheral>
         <peripheral key="usartf0" name="USARTF0" module-key="i6090_usart">
-            <register-group-instance key="usartf0" name="USARTF0" register-group-key="usart" address-space-key="data" offset="0xBA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xBA0"/>
         </peripheral>
         <peripheral key="usartf1" name="USARTF1" module-key="i6090_usart">
-            <register-group-instance key="usartf1" name="USARTF1" register-group-key="usart" address-space-key="data" offset="0xBB0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xBB0"/>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
         </peripheral>
         <peripheral key="spie" name="SPIE" module-key="i6090_spi">
-            <register-group-instance key="spie" name="SPIE" register-group-key="spi" address-space-key="data" offset="0xAC0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0xAC0"/>
         </peripheral>
         <peripheral key="spif" name="SPIF" module-key="i6090_spi">
-            <register-group-instance key="spif" name="SPIF" register-group-key="spi" address-space-key="data" offset="0xBC0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0xBC0"/>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
-            <register-group-instance key="aes" name="AES" register-group-key="aes" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="aes" address-space-key="data" offset="0xC0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3U.xml
index 2a7a782d..64b03b3d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3U.xml
@@ -62,37 +62,37 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="i6075_vport">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="i6075_vport">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="i6075_vport">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="i6075_vport">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
             <signals>
                 <signal pad-id="pr0" function="XTAL" group="XTAL2"/>
                 <signal pad-id="pr1" function="XTAL" group="XTAL1"/>
@@ -101,25 +101,25 @@
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pc7" function="CLKOUTC" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pc4" function="CLKOUTC_ALT" group="CLKOUT" field="CLKEVPIN"/>
@@ -137,22 +137,22 @@
             </signals>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
-            <register-group-instance key="aes" name="AES" register-group-key="aes" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="aes" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="dma" name="DMA" module-key="i3000">
-            <register-group-instance key="dma" name="DMA" register-group-key="dma" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="dma" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6099">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -175,7 +175,7 @@
             </signals>
         </peripheral>
         <peripheral key="adcb" name="ADCB" module-key="i6099">
-            <register-group-instance key="adcb" name="ADCB" register-group-key="adc" address-space-key="data" offset="0x240"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x240"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pb1" index="1" function="ADC" group="ADC"/>
@@ -190,7 +190,7 @@
             </signals>
         </peripheral>
         <peripheral key="dacb" name="DACB" module-key="i6059">
-            <register-group-instance key="dacb" name="DACB" register-group-key="dac" address-space-key="data" offset="0x320"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x320"/>
             <signals>
                 <signal pad-id="pb2" index="0" function="DAC" group="DAC"/>
                 <signal pad-id="pb3" index="1" function="DAC" group="DAC"/>
@@ -199,7 +199,7 @@
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pa1" index="1" function="AC" group="AC"/>
@@ -214,7 +214,7 @@
             </signals>
         </peripheral>
         <peripheral key="acb" name="ACB" module-key="i6077">
-            <register-group-instance key="acb" name="ACB" register-group-key="ac" address-space-key="data" offset="0x390"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x390"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pb1" index="1" function="AC" group="AC"/>
@@ -229,10 +229,10 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWI" group="SDA"/>
                 <signal pad-id="pc1" function="TWI" group="SCL"/>
@@ -243,7 +243,7 @@
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pe0" function="TWI" group="SDA"/>
                 <signal pad-id="pe1" function="TWI" group="SCL"/>
@@ -254,14 +254,14 @@
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
-            <register-group-instance key="usb" name="USB" register-group-key="usb" address-space-key="data" offset="0x4C0"/>
+            <register-group-instance register-group-key="usb" address-space-key="data" offset="0x4C0"/>
             <signals>
                 <signal pad-id="pd6" function="USB" group="DN"/>
                 <signal pad-id="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -274,7 +274,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -287,7 +287,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -300,7 +300,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -313,7 +313,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -326,7 +326,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -339,14 +339,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pc1" function="TC0" group="OC0B" field="TC0B"/>
@@ -359,14 +359,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TC1" group="OC1A"/>
                 <signal pad-id="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pd1" function="TC0" group="OC0B" field="TC0B"/>
@@ -379,14 +379,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcd1" name="TCD1" module-key="i6090_tc">
-            <register-group-instance key="tcd1" name="TCD1" register-group-key="tc1" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pd4" function="TC1" group="OC1A"/>
                 <signal pad-id="pd5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pe1" function="TC0" group="OC0B" field="TC0B"/>
@@ -399,14 +399,14 @@
             </signals>
         </peripheral>
         <peripheral key="tce1" name="TCE1" module-key="i6090_tc">
-            <register-group-instance key="tce1" name="TCE1" register-group-key="tc1" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pe4" function="TC1" group="OC1A"/>
                 <signal pad-id="pe5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
-            <register-group-instance key="tcf0" name="TCF0" register-group-key="tc0" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TC0" group="OC0A"/>
                 <signal pad-id="pf1" function="TC0" group="OC0B"/>
@@ -415,7 +415,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
-            <register-group-instance key="tcc2" name="TCC2" register-group-key="tc2" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pc1" function="TC2" group="LOC2B"/>
@@ -428,7 +428,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
-            <register-group-instance key="tcd2" name="TCD2" register-group-key="tc2" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pd1" function="TC2" group="LOC2B"/>
@@ -441,7 +441,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
-            <register-group-instance key="tce2" name="TCE2" register-group-key="tc2" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pe1" function="TC2" group="LOC2B"/>
@@ -454,7 +454,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
-            <register-group-instance key="tcf2" name="TCF2" register-group-key="tc2" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pf1" function="TC2" group="LOC2B"/>
@@ -467,7 +467,7 @@
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pc0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pc1" function="AWEX" group="OC0AHS"/>
@@ -480,7 +480,7 @@
             </signals>
         </peripheral>
         <peripheral key="awexe" name="AWEXE" module-key="i6090_awex">
-            <register-group-instance key="awexe" name="AWEXE" register-group-key="awex" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0xA80"/>
             <signals>
                 <signal pad-id="pe0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pe1" function="AWEX" group="OC0AHS"/>
@@ -493,19 +493,19 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="hiresd" name="HIRESD" module-key="i6090_hires">
-            <register-group-instance key="hiresd" name="HIRESD" register-group-key="hires" address-space-key="data" offset="0x990"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x990"/>
         </peripheral>
         <peripheral key="hirese" name="HIRESE" module-key="i6090_hires">
-            <register-group-instance key="hirese" name="HIRESE" register-group-key="hires" address-space-key="data" offset="0xA90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xA90"/>
         </peripheral>
         <peripheral key="hiresf" name="HIRESF" module-key="i6090_hires">
-            <register-group-instance key="hiresf" name="HIRESF" register-group-key="hires" address-space-key="data" offset="0xB90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xB90"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pc2" function="USART" group="RXD" field="USART0"/>
@@ -516,7 +516,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
-            <register-group-instance key="usartc1" name="USARTC1" register-group-key="usart" address-space-key="data" offset="0x8B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8B0"/>
             <signals>
                 <signal pad-id="pd5" function="USART" group="XCK"/>
                 <signal pad-id="pd6" function="USART" group="RXD"/>
@@ -524,7 +524,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
             <signals>
                 <signal pad-id="pd1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pd2" function="USART" group="RXD" field="USART0"/>
@@ -535,7 +535,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd1" name="USARTD1" module-key="i6090_usart">
-            <register-group-instance key="usartd1" name="USARTD1" register-group-key="usart" address-space-key="data" offset="0x9B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9B0"/>
             <signals>
                 <signal pad-id="pd5" function="USART" group="XCK"/>
                 <signal pad-id="pd6" function="USART" group="RXD"/>
@@ -543,7 +543,7 @@
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
             <signals>
                 <signal pad-id="pe1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pe2" function="USART" group="RXD" field="USART0"/>
@@ -554,7 +554,7 @@
             </signals>
         </peripheral>
         <peripheral key="usarte1" name="USARTE1" module-key="i6090_usart">
-            <register-group-instance key="usarte1" name="USARTE1" register-group-key="usart" address-space-key="data" offset="0xAB0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAB0"/>
             <signals>
                 <signal pad-id="pe5" function="USART" group="XCK"/>
                 <signal pad-id="pe6" function="USART" group="RXD"/>
@@ -562,7 +562,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartf0" name="USARTF0" module-key="i6090_usart">
-            <register-group-instance key="usartf0" name="USARTF0" register-group-key="usart" address-space-key="data" offset="0xBA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xBA0"/>
             <signals>
                 <signal pad-id="pf1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pf2" function="USART" group="RXD" field="USART0"/>
@@ -573,7 +573,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pc5" function="SPI" group="MOSI" field="SPI"/>
@@ -586,7 +586,7 @@
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
             <signals>
                 <signal pad-id="pd4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pd5" function="SPI" group="MOSI" field="SPI"/>
@@ -599,7 +599,7 @@
             </signals>
         </peripheral>
         <peripheral key="spie" name="SPIE" module-key="i6090_spi">
-            <register-group-instance key="spie" name="SPIE" register-group-key="spi" address-space-key="data" offset="0xAC0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0xAC0"/>
             <signals>
                 <signal pad-id="pe4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pe5" function="SPI" group="MOSI" field="SPI"/>
@@ -612,16 +612,16 @@
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6570_fuse">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6570_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i6570_sigrow">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A4U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A4U.xml
index f7c35060..90e038f3 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A4U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A4U.xml
@@ -60,37 +60,37 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="i6075_vport">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="i6075_vport">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="i6075_vport">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="i6075_vport">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
             <signals>
                 <signal pad-id="pr0" function="XTAL" group="XTAL2"/>
                 <signal pad-id="pr1" function="XTAL" group="XTAL1"/>
@@ -101,25 +101,25 @@
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pc7" function="CLKOUTC" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pc4" function="CLKOUTC_ALT" group="CLKOUT" field="CLKEVPIN"/>
@@ -133,22 +133,22 @@
             </signals>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
-            <register-group-instance key="aes" name="AES" register-group-key="aes" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="aes" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="dma" name="DMA" module-key="i3000">
-            <register-group-instance key="dma" name="DMA" register-group-key="dma" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="dma" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6099">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -167,7 +167,7 @@
             </signals>
         </peripheral>
         <peripheral key="dacb" name="DACB" module-key="i6059">
-            <register-group-instance key="dacb" name="DACB" register-group-key="dac" address-space-key="data" offset="0x320"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x320"/>
             <signals>
                 <signal pad-id="pb2" index="0" function="DAC" group="DAC"/>
                 <signal pad-id="pb3" index="1" function="DAC" group="DAC"/>
@@ -176,7 +176,7 @@
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pa1" index="1" function="AC" group="AC"/>
@@ -191,10 +191,10 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWI" group="SDA"/>
                 <signal pad-id="pc1" function="TWI" group="SCL"/>
@@ -205,21 +205,21 @@
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pe0" function="TWI" group="SDA"/>
                 <signal pad-id="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
-            <register-group-instance key="usb" name="USB" register-group-key="usb" address-space-key="data" offset="0x4C0"/>
+            <register-group-instance register-group-key="usb" address-space-key="data" offset="0x4C0"/>
             <signals>
                 <signal pad-id="pd6" function="USB" group="DN"/>
                 <signal pad-id="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -232,7 +232,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -241,7 +241,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -254,7 +254,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -267,7 +267,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -276,14 +276,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pc1" function="TC0" group="OC0B" field="TC0B"/>
@@ -296,14 +296,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TC1" group="OC1A"/>
                 <signal pad-id="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC0" group="OC0A"/>
                 <signal pad-id="pd1" function="TC0" group="OC0B"/>
@@ -316,14 +316,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcd1" name="TCD1" module-key="i6090_tc">
-            <register-group-instance key="tcd1" name="TCD1" register-group-key="tc1" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pd4" function="TC1" group="OC1A"/>
                 <signal pad-id="pd5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC0" group="OC0A"/>
                 <signal pad-id="pe1" function="TC0" group="OC0B"/>
@@ -332,7 +332,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
-            <register-group-instance key="tcc2" name="TCC2" register-group-key="tc2" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pc1" function="TC2" group="LOC2B"/>
@@ -345,7 +345,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
-            <register-group-instance key="tcd2" name="TCD2" register-group-key="tc2" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pd1" function="TC2" group="LOC2B"/>
@@ -358,7 +358,7 @@
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pc0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pc1" function="AWEX" group="OC0AHS"/>
@@ -371,16 +371,16 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="hiresd" name="HIRESD" module-key="i6090_hires">
-            <register-group-instance key="hiresd" name="HIRESD" register-group-key="hires" address-space-key="data" offset="0x990"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x990"/>
         </peripheral>
         <peripheral key="hirese" name="HIRESE" module-key="i6090_hires">
-            <register-group-instance key="hirese" name="HIRESE" register-group-key="hires" address-space-key="data" offset="0xA90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xA90"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pc2" function="USART" group="RXD" field="USART0"/>
@@ -391,7 +391,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
-            <register-group-instance key="usartc1" name="USARTC1" register-group-key="usart" address-space-key="data" offset="0x8B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8B0"/>
             <signals>
                 <signal pad-id="pd5" function="USART" group="XCK"/>
                 <signal pad-id="pd6" function="USART" group="RXD"/>
@@ -399,7 +399,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
             <signals>
                 <signal pad-id="pd1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pd2" function="USART" group="RXD" field="USART0"/>
@@ -410,7 +410,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd1" name="USARTD1" module-key="i6090_usart">
-            <register-group-instance key="usartd1" name="USARTD1" register-group-key="usart" address-space-key="data" offset="0x9B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9B0"/>
             <signals>
                 <signal pad-id="pd5" function="USART" group="XCK"/>
                 <signal pad-id="pd6" function="USART" group="RXD"/>
@@ -418,7 +418,7 @@
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
             <signals>
                 <signal pad-id="pe1" function="USART" group="XCK"/>
                 <signal pad-id="pe2" function="USART" group="RXD"/>
@@ -426,7 +426,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pc5" function="SPI" group="MOSI" field="SPI"/>
@@ -439,7 +439,7 @@
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
             <signals>
                 <signal pad-id="pd4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pd5" function="SPI" group="MOSI" field="SPI"/>
@@ -452,16 +452,16 @@
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6570_fuse">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6570_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i6570_sigrow">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128B1.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128B1.xml
index 8bd94333..9ffa7edd 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128B1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128B1.xml
@@ -62,28 +62,28 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="i6075_vport">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="i6075_vport">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="i6075_vport">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="i6075_vport">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="EXTERNAL_CLOCK" group="EXTCLK"/>
                 <signal pad-id="pc1" index="1" function="EXTERNAL_CLOCK" group="EXTCLK"/>
@@ -96,10 +96,10 @@
             </signals>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
             <signals>
                 <signal pad-id="pr0" function="XTAL" group="XTAL2"/>
                 <signal pad-id="pr1" function="XTAL" group="XTAL1"/>
@@ -110,28 +110,28 @@
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6080">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pd7" function="CLKOUTC" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pd7" function="EVOUTC" group="EVOUT" field="EVOUT"/>
@@ -141,22 +141,22 @@
             </signals>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
-            <register-group-instance key="aes" name="AES" register-group-key="aes" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="aes" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="dma" name="DMA" module-key="i3000">
-            <register-group-instance key="dma" name="DMA" register-group-key="dma" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="dma" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6110">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -179,7 +179,7 @@
             </signals>
         </peripheral>
         <peripheral key="adcb" name="ADCB" module-key="i6110">
-            <register-group-instance key="adcb" name="ADCB" register-group-key="adc" address-space-key="data" offset="0x240"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x240"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pb1" index="1" function="ADC" group="ADC"/>
@@ -194,7 +194,7 @@
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pa1" index="1" function="AC" group="AC"/>
@@ -209,7 +209,7 @@
             </signals>
         </peripheral>
         <peripheral key="acb" name="ACB" module-key="i6077">
-            <register-group-instance key="acb" name="ACB" register-group-key="ac" address-space-key="data" offset="0x390"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x390"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pb1" index="1" function="AC" group="AC"/>
@@ -224,24 +224,24 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWI" group="SDA"/>
                 <signal pad-id="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
-            <register-group-instance key="usb" name="USB" register-group-key="usb" address-space-key="data" offset="0x4C0"/>
+            <register-group-instance register-group-key="usb" address-space-key="data" offset="0x4C0"/>
             <signals>
                 <signal pad-id="pd0" function="USB" group="DN"/>
                 <signal pad-id="pd1" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -254,7 +254,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -267,7 +267,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -280,7 +280,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -288,7 +288,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -301,7 +301,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" register-group-key="port" address-space-key="data" offset="0x6C0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6C0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="PORTG" group="P"/>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
@@ -314,7 +314,7 @@
             </signals>
         </peripheral>
         <peripheral key="portm" name="PORTM" module-key="gpio_port">
-            <register-group-instance key="portm" name="PORTM" register-group-key="port" address-space-key="data" offset="0x760"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x760"/>
             <signals>
                 <signal pad-id="pm0" index="0" function="PORTM" group="P"/>
                 <signal pad-id="pm1" index="1" function="PORTM" group="P"/>
@@ -327,14 +327,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pc1" function="TC0" group="OC0B" field="TC0B"/>
@@ -347,14 +347,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TC1" group="OC1A"/>
                 <signal pad-id="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pe1" function="TC0" group="OC0B" field="TC0B"/>
@@ -367,7 +367,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
-            <register-group-instance key="tcc2" name="TCC2" register-group-key="tc2" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pc1" function="TC2" group="LOC2B"/>
@@ -380,7 +380,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
-            <register-group-instance key="tce2" name="TCE2" register-group-key="tc2" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pe1" function="TC2" group="LOC2B"/>
@@ -393,7 +393,7 @@
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pc0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pc1" function="AWEX" group="OC0AHS"/>
@@ -406,10 +406,10 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pc2" function="USART" group="RXD" field="USART0"/>
@@ -420,7 +420,7 @@
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
             <signals>
                 <signal pad-id="pe1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pe2" function="USART" group="RXD" field="USART0"/>
@@ -431,7 +431,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pc5" function="SPI" group="MOSI" field="SPI"/>
@@ -444,10 +444,10 @@
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="lcd" name="LCD" module-key="i3003">
-            <register-group-instance key="lcd" name="LCD" register-group-key="lcd" address-space-key="data" offset="0xD00"/>
+            <register-group-instance register-group-key="lcd" address-space-key="data" offset="0xD00"/>
             <signals>
                 <signal pad-id="pg0" index="39" function="LCD_SEG" group="SEG"/>
                 <signal pad-id="pg1" index="38" function="LCD_SEG" group="SEG"/>
@@ -510,10 +510,10 @@
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6570_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i3600">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128B3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128B3.xml
index 39a2b82c..60cdff58 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128B3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128B3.xml
@@ -62,28 +62,28 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="i6075_vport">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="i6075_vport">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="i6075_vport">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="i6075_vport">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="EXTERNAL_CLOCK" group="EXTCLK"/>
                 <signal pad-id="pc1" index="1" function="EXTERNAL_CLOCK" group="EXTCLK"/>
@@ -96,10 +96,10 @@
             </signals>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
             <signals>
                 <signal pad-id="pr0" function="XTAL" group="XTAL2"/>
                 <signal pad-id="pr1" function="XTAL" group="XTAL1"/>
@@ -108,28 +108,28 @@
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6080">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pd7" function="CLKOUTC" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pd7" function="EVOUTC" group="EVOUT" field="EVOUT"/>
@@ -137,22 +137,22 @@
             </signals>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
-            <register-group-instance key="aes" name="AES" register-group-key="aes" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="aes" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="dma" name="DMA" module-key="i3000">
-            <register-group-instance key="dma" name="DMA" register-group-key="dma" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="dma" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="adcb" name="ADCB" module-key="i6110">
-            <register-group-instance key="adcb" name="ADCB" register-group-key="adc" address-space-key="data" offset="0x240"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x240"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pb1" index="1" function="ADC" group="ADC"/>
@@ -166,7 +166,7 @@
             </signals>
         </peripheral>
         <peripheral key="acb" name="ACB" module-key="i6077">
-            <register-group-instance key="acb" name="ACB" register-group-key="ac" address-space-key="data" offset="0x390"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x390"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pb1" index="1" function="AC" group="AC"/>
@@ -181,24 +181,24 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWI" group="SDA"/>
                 <signal pad-id="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
-            <register-group-instance key="usb" name="USB" register-group-key="usb" address-space-key="data" offset="0x4C0"/>
+            <register-group-instance register-group-key="usb" address-space-key="data" offset="0x4C0"/>
             <signals>
                 <signal pad-id="pd0" function="USB" group="DN"/>
                 <signal pad-id="pd1" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -211,7 +211,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -224,14 +224,14 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" register-group-key="port" address-space-key="data" offset="0x6C0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6C0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="PORTG" group="P"/>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
@@ -244,7 +244,7 @@
             </signals>
         </peripheral>
         <peripheral key="portm" name="PORTM" module-key="gpio_port">
-            <register-group-instance key="portm" name="PORTM" register-group-key="port" address-space-key="data" offset="0x760"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x760"/>
             <signals>
                 <signal pad-id="pm0" index="0" function="PORTM" group="P"/>
                 <signal pad-id="pm1" index="1" function="PORTM" group="P"/>
@@ -257,14 +257,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pc1" function="TC0" group="OC0B" field="TC0B"/>
@@ -277,14 +277,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TC1" group="OC1A"/>
                 <signal pad-id="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
-            <register-group-instance key="tcc2" name="TCC2" register-group-key="tc2" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pc1" function="TC2" group="LOC2B"/>
@@ -297,7 +297,7 @@
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pc0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pc1" function="AWEX" group="OC0AHS"/>
@@ -310,10 +310,10 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pc2" function="USART" group="RXD" field="USART0"/>
@@ -324,7 +324,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pc5" function="SPI" group="MOSI" field="SPI"/>
@@ -337,10 +337,10 @@
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="lcd" name="LCD" module-key="i3003">
-            <register-group-instance key="lcd" name="LCD" register-group-key="lcd" address-space-key="data" offset="0xD00"/>
+            <register-group-instance register-group-key="lcd" address-space-key="data" offset="0xD00"/>
             <signals>
                 <signal pad-id="pg0" index="24" function="LCD_SEG" group="SEG"/>
                 <signal pad-id="pg1" index="23" function="LCD_SEG" group="SEG"/>
@@ -388,10 +388,10 @@
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6570_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i3600">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128C3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128C3.xml
index 47331de6..abed3a83 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128C3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128C3.xml
@@ -60,37 +60,37 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="i6075_vport">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="i6075_vport">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="i6075_vport">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="i6075_vport">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
             <signals>
                 <signal pad-id="pr0" function="XTAL" group="XTAL2"/>
                 <signal pad-id="pr1" function="XTAL" group="XTAL1"/>
@@ -99,25 +99,25 @@
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
@@ -127,16 +127,16 @@
             </signals>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6110">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -159,7 +159,7 @@
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pa1" index="1" function="AC" group="AC"/>
@@ -174,31 +174,31 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWI" group="SDA"/>
                 <signal pad-id="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pe0" function="TWI" group="SDA"/>
                 <signal pad-id="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
-            <register-group-instance key="usb" name="USB" register-group-key="usb" address-space-key="data" offset="0x4C0"/>
+            <register-group-instance register-group-key="usb" address-space-key="data" offset="0x4C0"/>
             <signals>
                 <signal pad-id="pd6" function="USB" group="DN"/>
                 <signal pad-id="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -211,7 +211,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -224,7 +224,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -237,7 +237,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -250,7 +250,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -263,7 +263,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -276,14 +276,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pc1" function="TC0" group="OC0B" field="TC0B"/>
@@ -296,14 +296,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TC1" group="OC1A"/>
                 <signal pad-id="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC0" group="OC0A"/>
                 <signal pad-id="pd1" function="TC0" group="OC0B"/>
@@ -312,7 +312,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC0" group="OC0A"/>
                 <signal pad-id="pe1" function="TC0" group="OC0B"/>
@@ -321,7 +321,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
-            <register-group-instance key="tcf0" name="TCF0" register-group-key="tc0" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TC0" group="OC0A"/>
                 <signal pad-id="pf1" function="TC0" group="OC0B"/>
@@ -330,7 +330,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
-            <register-group-instance key="tcc2" name="TCC2" register-group-key="tc2" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pc1" function="TC2" group="LOC2B"/>
@@ -343,7 +343,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
-            <register-group-instance key="tcd2" name="TCD2" register-group-key="tc2" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pd1" function="TC2" group="LOC2B"/>
@@ -356,7 +356,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
-            <register-group-instance key="tce2" name="TCE2" register-group-key="tc2" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pe1" function="TC2" group="LOC2B"/>
@@ -369,7 +369,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
-            <register-group-instance key="tcf2" name="TCF2" register-group-key="tc2" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pf1" function="TC2" group="LOC2B"/>
@@ -382,7 +382,7 @@
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pc0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pc1" function="AWEX" group="OC0AHS"/>
@@ -395,10 +395,10 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pc2" function="USART" group="RXD" field="USART0"/>
@@ -409,7 +409,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
             <signals>
                 <signal pad-id="pd1" function="USART" group="XCK"/>
                 <signal pad-id="pd2" function="USART" group="RXD"/>
@@ -417,7 +417,7 @@
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
             <signals>
                 <signal pad-id="pe1" function="USART" group="XCK"/>
                 <signal pad-id="pe2" function="USART" group="RXD"/>
@@ -425,7 +425,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pc5" function="SPI" group="MOSI" field="SPI"/>
@@ -438,7 +438,7 @@
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
             <signals>
                 <signal pad-id="pd4" function="SPI" group="SS"/>
                 <signal pad-id="pd5" function="SPI" group="MOSI"/>
@@ -447,16 +447,16 @@
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6570_fuse">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6570_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i3610">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128D3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128D3.xml
index f2e49cbf..1809f81a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128D3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128D3.xml
@@ -61,25 +61,25 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
             <signals>
                 <signal pad-id="pr0" function="XTAL" group="XTAL2"/>
                 <signal pad-id="pr1" function="XTAL" group="XTAL1"/>
@@ -88,43 +88,43 @@
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6076">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6076">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i6076">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pa1" index="1" function="AC" group="AC"/>
@@ -139,7 +139,7 @@
             </signals>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6110">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -162,24 +162,24 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWI" group="SDA"/>
                 <signal pad-id="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pe0" function="TWI" group="SDA"/>
                 <signal pad-id="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="port_cfg" name="PORT_CFG" module-key="gpio_port">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
@@ -189,19 +189,19 @@
             </signals>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="gpio_port">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="gpio_port">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="gpio_port">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="gpio_port">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -214,7 +214,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -227,7 +227,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -240,7 +240,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -253,7 +253,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -266,7 +266,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -279,14 +279,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pc1" function="TC0" group="OC0B" field="TC0B"/>
@@ -299,14 +299,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TC1" group="OC1A"/>
                 <signal pad-id="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_tc">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pc0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pc1" function="AWEX" group="OC0AHS"/>
@@ -319,10 +319,10 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_tc">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC0" group="OC0A"/>
                 <signal pad-id="pd1" function="TC0" group="OC0B"/>
@@ -331,7 +331,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC0" group="OC0A"/>
                 <signal pad-id="pe1" function="TC0" group="OC0B"/>
@@ -340,10 +340,10 @@
             </signals>
         </peripheral>
         <peripheral key="awexe" name="AWEXE" module-key="i6090_tc">
-            <register-group-instance key="awexe" name="AWEXE" register-group-key="awex" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0xA80"/>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
-            <register-group-instance key="tcf0" name="TCF0" register-group-key="tc0" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TC0" group="OC0A"/>
                 <signal pad-id="pf1" function="TC0" group="OC0B"/>
@@ -352,7 +352,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
-            <register-group-instance key="tcc2" name="TCC2" register-group-key="tc2" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pc1" function="TC2" group="LOC2B"/>
@@ -365,7 +365,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
-            <register-group-instance key="tcd2" name="TCD2" register-group-key="tc2" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pd1" function="TC2" group="LOC2B"/>
@@ -378,7 +378,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
-            <register-group-instance key="tce2" name="TCE2" register-group-key="tc2" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pe1" function="TC2" group="LOC2B"/>
@@ -391,7 +391,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
-            <register-group-instance key="tcf2" name="TCF2" register-group-key="tc2" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pf1" function="TC2" group="LOC2B"/>
@@ -404,7 +404,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pc2" function="USART" group="RXD" field="USART0"/>
@@ -415,7 +415,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
             <signals>
                 <signal pad-id="pd1" function="USART" group="XCK"/>
                 <signal pad-id="pd2" function="USART" group="RXD"/>
@@ -423,7 +423,7 @@
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
             <signals>
                 <signal pad-id="pe1" function="USART" group="XCK"/>
                 <signal pad-id="pe2" function="USART" group="RXD"/>
@@ -431,7 +431,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pc5" function="SPI" group="MOSI" field="SPI"/>
@@ -444,7 +444,7 @@
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
             <signals>
                 <signal pad-id="pd4" function="SPI" group="SS"/>
                 <signal pad-id="pd5" function="SPI" group="MOSI"/>
@@ -453,10 +453,10 @@
             </signals>
         </peripheral>
         <peripheral key="spie" name="SPIE" module-key="i6090_spi">
-            <register-group-instance key="spie" name="SPIE" register-group-key="spi" address-space-key="data" offset="0xAC0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0xAC0"/>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128D4.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128D4.xml
index 1b2dcd8d..a6e0ef06 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128D4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128D4.xml
@@ -60,37 +60,37 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="i6075_vport">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="i6075_vport">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="i6075_vport">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="i6075_vport">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
             <signals>
                 <signal pad-id="pr0" function="XTAL" group="XTAL2"/>
                 <signal pad-id="pr1" function="XTAL" group="XTAL1"/>
@@ -101,25 +101,25 @@
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
@@ -129,16 +129,16 @@
             </signals>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6110">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -157,7 +157,7 @@
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pa1" index="1" function="AC" group="AC"/>
@@ -171,24 +171,24 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWI" group="SDA"/>
                 <signal pad-id="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pe0" function="TWI" group="SDA"/>
                 <signal pad-id="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -201,7 +201,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -210,7 +210,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -223,7 +223,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -236,7 +236,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -245,14 +245,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TCC" group="OC0A" field="TC0A"/>
                 <signal pad-id="pc1" function="TCC" group="OC0B" field="TC0B"/>
@@ -265,14 +265,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TCC" group="OC1A"/>
                 <signal pad-id="pc5" function="TCC" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TCC" group="OC0A"/>
                 <signal pad-id="pd1" function="TCC" group="OC0B"/>
@@ -281,7 +281,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TCE" group="OC0A"/>
                 <signal pad-id="pe1" function="TCE" group="OC0B"/>
@@ -290,7 +290,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
-            <register-group-instance key="tcc2" name="TCC2" register-group-key="tc2" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TCC2" group="LOC2A"/>
                 <signal pad-id="pc1" function="TCC2" group="LOC2B"/>
@@ -303,7 +303,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
-            <register-group-instance key="tcd2" name="TCD2" register-group-key="tc2" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pd1" function="TC2" group="LOC2B"/>
@@ -316,7 +316,7 @@
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pc0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pc1" function="AWEX" group="OC0AHS"/>
@@ -329,10 +329,10 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pc2" function="USART" group="RXD" field="USART0"/>
@@ -343,7 +343,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
             <signals>
                 <signal pad-id="pd1" function="USART" group="XCK"/>
                 <signal pad-id="pd2" function="USART" group="RXD"/>
@@ -351,7 +351,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pc5" function="SPI" group="MOSI" field="SPI"/>
@@ -364,7 +364,7 @@
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
             <signals>
                 <signal pad-id="pd4" function="SPI" group="SS"/>
                 <signal pad-id="pd5" function="SPI" group="MOSI"/>
@@ -373,16 +373,16 @@
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6570_fuse">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6570_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i6570_sigrow">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4.xml
index cc77cc9a..ddbeff94 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4.xml
@@ -61,97 +61,97 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="dma" name="DMA" module-key="i3000">
-            <register-group-instance key="dma" name="DMA" register-group-key="dma" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="dma" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6076">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6076">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i6076">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6064">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="dacb" name="DACB" module-key="i6059">
-            <register-group-instance key="dacb" name="DACB" register-group-key="dac" address-space-key="data" offset="0x320"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x320"/>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
         </peripheral>
         <peripheral key="port_cfg" name="PORT_CFG" module-key="gpio_port">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="gpio_port">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="gpio_port">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="gpio_port">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="gpio_port">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -164,7 +164,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -173,7 +173,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -186,7 +186,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -199,7 +199,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -208,65 +208,65 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_tc">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_tc">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
         </peripheral>
         <peripheral key="tcd1" name="TCD1" module-key="i6090_tc">
-            <register-group-instance key="tcd1" name="TCD1" register-group-key="tc1" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x940"/>
         </peripheral>
         <peripheral key="hiresd" name="HIRESD" module-key="i6090_tc">
-            <register-group-instance key="hiresd" name="HIRESD" register-group-key="hires" address-space-key="data" offset="0x990"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x990"/>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
         </peripheral>
         <peripheral key="hirese" name="HIRESE" module-key="i6090_tc">
-            <register-group-instance key="hirese" name="HIRESE" register-group-key="hires" address-space-key="data" offset="0xA90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xA90"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
-            <register-group-instance key="usartc1" name="USARTC1" register-group-key="usart" address-space-key="data" offset="0x8B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8B0"/>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
         </peripheral>
         <peripheral key="usartd1" name="USARTD1" module-key="i6090_usart">
-            <register-group-instance key="usartd1" name="USARTD1" register-group-key="usart" address-space-key="data" offset="0x9B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9B0"/>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
-            <register-group-instance key="aes" name="AES" register-group-key="aes" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="aes" address-space-key="data" offset="0xC0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4U.xml
index 44c090bf..daaaf1d2 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4U.xml
@@ -60,37 +60,37 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="i6075_vport">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="i6075_vport">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="i6075_vport">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="i6075_vport">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
             <signals>
                 <signal pad-id="pr0" function="XTAL" group="XTAL2"/>
                 <signal pad-id="pr1" function="XTAL" group="XTAL1"/>
@@ -101,25 +101,25 @@
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pc7" function="CLKOUTC" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pc4" function="CLKOUTC_ALT" group="CLKOUT" field="CLKEVPIN"/>
@@ -133,22 +133,22 @@
             </signals>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
-            <register-group-instance key="aes" name="AES" register-group-key="aes" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="aes" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="dma" name="DMA" module-key="i3000">
-            <register-group-instance key="dma" name="DMA" register-group-key="dma" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="dma" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6099">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -167,7 +167,7 @@
             </signals>
         </peripheral>
         <peripheral key="dacb" name="DACB" module-key="i6059">
-            <register-group-instance key="dacb" name="DACB" register-group-key="dac" address-space-key="data" offset="0x320"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x320"/>
             <signals>
                 <signal pad-id="pb2" index="0" function="DAC" group="DAC"/>
                 <signal pad-id="pb3" index="1" function="DAC" group="DAC"/>
@@ -176,7 +176,7 @@
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pa1" index="1" function="AC" group="AC"/>
@@ -191,10 +191,10 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWI" group="SDA"/>
                 <signal pad-id="pc1" function="TWI" group="SCL"/>
@@ -205,21 +205,21 @@
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pe0" function="TWI" group="SDA"/>
                 <signal pad-id="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
-            <register-group-instance key="usb" name="USB" register-group-key="usb" address-space-key="data" offset="0x4C0"/>
+            <register-group-instance register-group-key="usb" address-space-key="data" offset="0x4C0"/>
             <signals>
                 <signal pad-id="pd6" function="USB" group="DN"/>
                 <signal pad-id="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -232,7 +232,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -241,7 +241,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -254,7 +254,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -267,7 +267,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -276,14 +276,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pc1" function="TC0" group="OC0B" field="TC0B"/>
@@ -296,14 +296,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TC1" group="OC1A"/>
                 <signal pad-id="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC0" group="OC0A"/>
                 <signal pad-id="pd1" function="TC0" group="OC0B"/>
@@ -316,14 +316,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcd1" name="TCD1" module-key="i6090_tc">
-            <register-group-instance key="tcd1" name="TCD1" register-group-key="tc1" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pd4" function="TC1" group="OC1A"/>
                 <signal pad-id="pd5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC0" group="OC0A"/>
                 <signal pad-id="pe1" function="TC0" group="OC0B"/>
@@ -332,7 +332,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
-            <register-group-instance key="tcc2" name="TCC2" register-group-key="tc2" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pc1" function="TC2" group="LOC2B"/>
@@ -345,7 +345,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
-            <register-group-instance key="tcd2" name="TCD2" register-group-key="tc2" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pd1" function="TC2" group="LOC2B"/>
@@ -358,7 +358,7 @@
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pc0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pc1" function="AWEX" group="OC0AHS"/>
@@ -371,16 +371,16 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="hiresd" name="HIRESD" module-key="i6090_hires">
-            <register-group-instance key="hiresd" name="HIRESD" register-group-key="hires" address-space-key="data" offset="0x990"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x990"/>
         </peripheral>
         <peripheral key="hirese" name="HIRESE" module-key="i6090_hires">
-            <register-group-instance key="hirese" name="HIRESE" register-group-key="hires" address-space-key="data" offset="0xA90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xA90"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pc2" function="USART" group="RXD" field="USART0"/>
@@ -391,7 +391,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
-            <register-group-instance key="usartc1" name="USARTC1" register-group-key="usart" address-space-key="data" offset="0x8B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8B0"/>
             <signals>
                 <signal pad-id="pd5" function="USART" group="XCK"/>
                 <signal pad-id="pd6" function="USART" group="RXD"/>
@@ -399,7 +399,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
             <signals>
                 <signal pad-id="pd1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pd2" function="USART" group="RXD" field="USART0"/>
@@ -410,7 +410,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd1" name="USARTD1" module-key="i6090_usart">
-            <register-group-instance key="usartd1" name="USARTD1" register-group-key="usart" address-space-key="data" offset="0x9B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9B0"/>
             <signals>
                 <signal pad-id="pd5" function="USART" group="XCK"/>
                 <signal pad-id="pd6" function="USART" group="RXD"/>
@@ -418,7 +418,7 @@
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
             <signals>
                 <signal pad-id="pe1" function="USART" group="XCK"/>
                 <signal pad-id="pe2" function="USART" group="RXD"/>
@@ -426,7 +426,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pc5" function="SPI" group="MOSI" field="SPI"/>
@@ -439,7 +439,7 @@
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
             <signals>
                 <signal pad-id="pd4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pd5" function="SPI" group="MOSI" field="SPI"/>
@@ -452,16 +452,16 @@
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6570_fuse">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6570_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i6570_sigrow">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16C4.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16C4.xml
index 1d9466e4..1026599e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16C4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16C4.xml
@@ -60,37 +60,37 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="i6075_vport">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="i6075_vport">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="i6075_vport">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="i6075_vport">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
             <signals>
                 <signal pad-id="pr0" function="XTAL" group="XTAL2"/>
                 <signal pad-id="pr1" function="XTAL" group="XTAL1"/>
@@ -101,25 +101,25 @@
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
@@ -129,16 +129,16 @@
             </signals>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6110">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -157,7 +157,7 @@
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pa1" index="1" function="AC" group="AC"/>
@@ -171,31 +171,31 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWI" group="SDA"/>
                 <signal pad-id="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pe0" function="TWI" group="SDA"/>
                 <signal pad-id="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
-            <register-group-instance key="usb" name="USB" register-group-key="usb" address-space-key="data" offset="0x4C0"/>
+            <register-group-instance register-group-key="usb" address-space-key="data" offset="0x4C0"/>
             <signals>
                 <signal pad-id="pd6" function="USB" group="DN"/>
                 <signal pad-id="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -208,7 +208,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -217,7 +217,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -230,7 +230,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -243,7 +243,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -252,14 +252,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TCC" group="OC0A" field="TC0A"/>
                 <signal pad-id="pc1" function="TCC" group="OC0B" field="TC0B"/>
@@ -272,14 +272,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TCC" group="OC1A"/>
                 <signal pad-id="pc5" function="TCC" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC0" group="OC0A"/>
                 <signal pad-id="pd1" function="TC0" group="OC0B"/>
@@ -288,7 +288,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TCE" group="OC0A"/>
                 <signal pad-id="pe1" function="TCE" group="OC0B"/>
@@ -297,7 +297,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
-            <register-group-instance key="tcc2" name="TCC2" register-group-key="tc2" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pc1" function="TC2" group="LOC2B"/>
@@ -310,7 +310,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
-            <register-group-instance key="tcd2" name="TCD2" register-group-key="tc2" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pd1" function="TC2" group="LOC2B"/>
@@ -323,7 +323,7 @@
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pc0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pc1" function="AWEX" group="OC0AHS"/>
@@ -336,10 +336,10 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pc2" function="USART" group="RXD" field="USART0"/>
@@ -350,7 +350,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
-            <register-group-instance key="usartc1" name="USARTC1" register-group-key="usart" address-space-key="data" offset="0x8B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8B0"/>
             <signals>
                 <signal pad-id="pc5" function="USART" group="XCK"/>
                 <signal pad-id="pc6" function="USART" group="RXD"/>
@@ -358,7 +358,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
             <signals>
                 <signal pad-id="pd1" function="USART" group="XCK"/>
                 <signal pad-id="pd2" function="USART" group="RXD"/>
@@ -366,7 +366,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pc5" function="SPI" group="MOSI" field="SPI"/>
@@ -379,7 +379,7 @@
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
             <signals>
                 <signal pad-id="pd4" function="SPI" group="SS"/>
                 <signal pad-id="pd5" function="SPI" group="MOSI"/>
@@ -388,16 +388,16 @@
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6570_fuse">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6570_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i3610">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16D4.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16D4.xml
index de59f570..7cb88cb8 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16D4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16D4.xml
@@ -61,25 +61,25 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
             <signals>
                 <signal pad-id="pr0" function="XTAL" group="XTAL2"/>
                 <signal pad-id="pr1" function="XTAL" group="XTAL1"/>
@@ -90,43 +90,43 @@
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6076">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6076">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i6076">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pa1" index="1" function="AC" group="AC"/>
@@ -140,7 +140,7 @@
             </signals>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6099">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -159,24 +159,24 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWI" group="SDA"/>
                 <signal pad-id="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pe0" function="TWI" group="SDA"/>
                 <signal pad-id="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="port_cfg" name="PORT_CFG" module-key="gpio_port">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
@@ -186,19 +186,19 @@
             </signals>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="gpio_port">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="gpio_port">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="gpio_port">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="gpio_port">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -211,7 +211,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -220,7 +220,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -233,7 +233,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -246,7 +246,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -255,14 +255,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TCC" group="OC0A" field="TC0A"/>
                 <signal pad-id="pc1" function="TCC" group="OC0B" field="TC0B"/>
@@ -275,14 +275,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TCC" group="OC1A"/>
                 <signal pad-id="pc5" function="TCC" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_tc">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pc0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pc1" function="AWEX" group="OC0AHS"/>
@@ -295,10 +295,10 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_tc">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TCC" group="OC0A"/>
                 <signal pad-id="pd1" function="TCC" group="OC0B"/>
@@ -307,7 +307,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TCE" group="OC0A"/>
                 <signal pad-id="pe1" function="TCE" group="OC0B"/>
@@ -316,7 +316,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
-            <register-group-instance key="tcc2" name="TCC2" register-group-key="tc2" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TCC2" group="LOC2A"/>
                 <signal pad-id="pc1" function="TCC2" group="LOC2B"/>
@@ -329,7 +329,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pc2" function="USART" group="RXD" field="USART0"/>
@@ -340,7 +340,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
             <signals>
                 <signal pad-id="pd1" function="TCC" group="XCK"/>
                 <signal pad-id="pd2" function="TCC" group="RXD"/>
@@ -348,7 +348,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pc5" function="SPI" group="MOSI" field="SPI"/>
@@ -361,7 +361,7 @@
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
             <signals>
                 <signal pad-id="pd4" function="SPI" group="SS"/>
                 <signal pad-id="pd5" function="SPI" group="MOSI"/>
@@ -370,7 +370,7 @@
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16E5.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16E5.xml
index 383af49d..bf317a9d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16E5.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16E5.xml
@@ -60,40 +60,40 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="i6075_vport">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="i6075_vport">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="i6075_vport">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="i6075_vport">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pc4" function="EXTERNAL_CLOCK" group="EXTCLK"/>
             </signals>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
             <signals>
                 <signal pad-id="pr0" function="XTAL" group="XTAL2"/>
                 <signal pad-id="pr1" function="XTAL" group="XTAL1"/>
@@ -102,22 +102,22 @@
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pd7" function="CLKOUTD" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pd4" function="CLKOUTD_ALT" group="CLKOUT" field="CLKEVPIN"/>
@@ -130,19 +130,19 @@
             </signals>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="edma" name="EDMA" module-key="i3002">
-            <register-group-instance key="edma" name="EDMA" register-group-key="edma" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="edma" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i3620_nvm">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6110">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -165,7 +165,7 @@
             </signals>
         </peripheral>
         <peripheral key="daca" name="DACA" module-key="i6059">
-            <register-group-instance key="daca" name="DACA" register-group-key="dac" address-space-key="data" offset="0x300"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x300"/>
             <signals>
                 <signal pad-id="pa2" index="0" function="DAC" group="DAC"/>
                 <signal pad-id="pa3" index="1" function="DAC" group="DAC"/>
@@ -174,7 +174,7 @@
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pa1" index="1" function="AC" group="AC"/>
@@ -195,10 +195,10 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="xcl" name="XCL" module-key="i3008">
-            <register-group-instance key="xcl" name="XCL" register-group-key="xcl" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="xcl" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pc0" index="1" function="XCLIN_LSB_PC" group="IN"/>
                 <signal pad-id="pc1" index="2" function="XCLIN_LSB_PC" group="IN"/>
@@ -225,7 +225,7 @@
             </signals>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWI" group="SDA"/>
                 <signal pad-id="pc1" function="TWI" group="SCL"/>
@@ -234,7 +234,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -247,7 +247,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -260,7 +260,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -273,14 +273,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc4" name="TCC4" module-key="i3007_tc">
-            <register-group-instance key="tcc4" name="TCC4" register-group-key="tc4" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc4" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC4" group="OC4A" field="TC4A"/>
                 <signal pad-id="pc1" function="TC4" group="OC4B" field="TC4B"/>
@@ -293,27 +293,27 @@
             </signals>
         </peripheral>
         <peripheral key="tcc5" name="TCC5" module-key="i3007_tc">
-            <register-group-instance key="tcc5" name="TCC5" register-group-key="tc5" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc5" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TC5" group="OC5A"/>
                 <signal pad-id="pc5" function="TC5" group="OC5B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd5" name="TCD5" module-key="i3007_tc">
-            <register-group-instance key="tcd5" name="TCD5" register-group-key="tc5" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="tc5" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pd4" function="TC5" group="OC5A"/>
                 <signal pad-id="pd5" function="TC5" group="OC5B"/>
             </signals>
         </peripheral>
         <peripheral key="faultc4" name="FAULTC4" module-key="i3620_fault">
-            <register-group-instance key="faultc4" name="FAULTC4" register-group-key="fault" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="fault" address-space-key="data" offset="0x880"/>
         </peripheral>
         <peripheral key="faultc5" name="FAULTC5" module-key="i3620_fault">
-            <register-group-instance key="faultc5" name="FAULTC5" register-group-key="fault" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="fault" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="wexc" name="WEXC" module-key="i3007_wex">
-            <register-group-instance key="wexc" name="WEXC" register-group-key="wex" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="wex" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc0" function="WEX" group="OC4ALS"/>
                 <signal pad-id="pc1" function="WEX" group="OC4AHS"/>
@@ -326,10 +326,10 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i3620_hires">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x8B0"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x8B0"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i4000">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pc2" function="USART" group="RXD" field="USART0"/>
@@ -340,7 +340,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i4000">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9C0"/>
             <signals>
                 <signal pad-id="pd1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pd2" function="USART" group="RXD" field="USART0"/>
@@ -351,7 +351,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8E0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8E0"/>
             <signals>
                 <signal pad-id="pc4" function="SPI" group="SS"/>
                 <signal pad-id="pc5" function="SPI" group="SCK"/>
@@ -360,16 +360,16 @@
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i3620_fuse">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i3620_fuse">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i3620_sigrow">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3.xml
index 668a3d63..b741637f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3.xml
@@ -62,103 +62,103 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="dma" name="DMA" module-key="i3000">
-            <register-group-instance key="dma" name="DMA" register-group-key="dma" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="dma" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6076">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6076">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i6076">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
         </peripheral>
         <peripheral key="acb" name="ACB" module-key="i6077">
-            <register-group-instance key="acb" name="ACB" register-group-key="ac" address-space-key="data" offset="0x390"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x390"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6064">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="adcb" name="ADCB" module-key="i6064">
-            <register-group-instance key="adcb" name="ADCB" register-group-key="adc" address-space-key="data" offset="0x240"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x240"/>
         </peripheral>
         <peripheral key="dacb" name="DACB" module-key="i6059">
-            <register-group-instance key="dacb" name="DACB" register-group-key="dac" address-space-key="data" offset="0x320"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x320"/>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
         </peripheral>
         <peripheral key="port_cfg" name="PORT_CFG" module-key="gpio_port">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="gpio_port">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="gpio_port">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="gpio_port">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="gpio_port">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -171,7 +171,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -184,7 +184,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -197,7 +197,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -210,7 +210,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -223,7 +223,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -236,92 +236,92 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_tc">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_tc">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
         </peripheral>
         <peripheral key="tcd1" name="TCD1" module-key="i6090_tc">
-            <register-group-instance key="tcd1" name="TCD1" register-group-key="tc1" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x940"/>
         </peripheral>
         <peripheral key="hiresd" name="HIRESD" module-key="i6090_tc">
-            <register-group-instance key="hiresd" name="HIRESD" register-group-key="hires" address-space-key="data" offset="0x990"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x990"/>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
         </peripheral>
         <peripheral key="tce1" name="TCE1" module-key="i6090_tc">
-            <register-group-instance key="tce1" name="TCE1" register-group-key="tc1" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0xA40"/>
         </peripheral>
         <peripheral key="awexe" name="AWEXE" module-key="i6090_tc">
-            <register-group-instance key="awexe" name="AWEXE" register-group-key="awex" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0xA80"/>
         </peripheral>
         <peripheral key="hirese" name="HIRESE" module-key="i6090_tc">
-            <register-group-instance key="hirese" name="HIRESE" register-group-key="hires" address-space-key="data" offset="0xA90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xA90"/>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
-            <register-group-instance key="tcf0" name="TCF0" register-group-key="tc0" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xB00"/>
         </peripheral>
         <peripheral key="hiresf" name="HIRESF" module-key="i6090_tc">
-            <register-group-instance key="hiresf" name="HIRESF" register-group-key="hires" address-space-key="data" offset="0xB90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xB90"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
-            <register-group-instance key="usartc1" name="USARTC1" register-group-key="usart" address-space-key="data" offset="0x8B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8B0"/>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
         </peripheral>
         <peripheral key="usartd1" name="USARTD1" module-key="i6090_usart">
-            <register-group-instance key="usartd1" name="USARTD1" register-group-key="usart" address-space-key="data" offset="0x9B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9B0"/>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
         </peripheral>
         <peripheral key="usarte1" name="USARTE1" module-key="i6090_usart">
-            <register-group-instance key="usarte1" name="USARTE1" register-group-key="usart" address-space-key="data" offset="0xAB0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAB0"/>
         </peripheral>
         <peripheral key="usartf0" name="USARTF0" module-key="i6090_usart">
-            <register-group-instance key="usartf0" name="USARTF0" register-group-key="usart" address-space-key="data" offset="0xBA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xBA0"/>
         </peripheral>
         <peripheral key="usartf1" name="USARTF1" module-key="i6090_usart">
-            <register-group-instance key="usartf1" name="USARTF1" register-group-key="usart" address-space-key="data" offset="0xBB0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xBB0"/>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
         </peripheral>
         <peripheral key="spie" name="SPIE" module-key="i6090_spi">
-            <register-group-instance key="spie" name="SPIE" register-group-key="spi" address-space-key="data" offset="0xAC0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0xAC0"/>
         </peripheral>
         <peripheral key="spif" name="SPIF" module-key="i6090_spi">
-            <register-group-instance key="spif" name="SPIF" register-group-key="spi" address-space-key="data" offset="0xBC0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0xBC0"/>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
-            <register-group-instance key="aes" name="AES" register-group-key="aes" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="aes" address-space-key="data" offset="0xC0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3U.xml
index 17c13cd6..ff16f084 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3U.xml
@@ -62,37 +62,37 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="i6075_vport">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="i6075_vport">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="i6075_vport">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="i6075_vport">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
             <signals>
                 <signal pad-id="pr0" function="XTAL" group="XTAL2"/>
                 <signal pad-id="pr1" function="XTAL" group="XTAL1"/>
@@ -101,25 +101,25 @@
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pc7" function="CLKOUTC" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pc4" function="CLKOUTC_ALT" group="CLKOUT" field="CLKEVPIN"/>
@@ -137,22 +137,22 @@
             </signals>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
-            <register-group-instance key="aes" name="AES" register-group-key="aes" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="aes" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="dma" name="DMA" module-key="i3000">
-            <register-group-instance key="dma" name="DMA" register-group-key="dma" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="dma" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6099">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -175,7 +175,7 @@
             </signals>
         </peripheral>
         <peripheral key="adcb" name="ADCB" module-key="i6099">
-            <register-group-instance key="adcb" name="ADCB" register-group-key="adc" address-space-key="data" offset="0x240"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x240"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pb1" index="1" function="ADC" group="ADC"/>
@@ -190,7 +190,7 @@
             </signals>
         </peripheral>
         <peripheral key="dacb" name="DACB" module-key="i6059">
-            <register-group-instance key="dacb" name="DACB" register-group-key="dac" address-space-key="data" offset="0x320"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x320"/>
             <signals>
                 <signal pad-id="pb2" index="0" function="DAC" group="DAC"/>
                 <signal pad-id="pb3" index="1" function="DAC" group="DAC"/>
@@ -199,7 +199,7 @@
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pa1" index="1" function="AC" group="AC"/>
@@ -214,7 +214,7 @@
             </signals>
         </peripheral>
         <peripheral key="acb" name="ACB" module-key="i6077">
-            <register-group-instance key="acb" name="ACB" register-group-key="ac" address-space-key="data" offset="0x390"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x390"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pb1" index="1" function="AC" group="AC"/>
@@ -229,10 +229,10 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWI" group="SDA"/>
                 <signal pad-id="pc1" function="TWI" group="SCL"/>
@@ -243,7 +243,7 @@
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pe0" function="TWI" group="SDA"/>
                 <signal pad-id="pe1" function="TWI" group="SCL"/>
@@ -254,14 +254,14 @@
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
-            <register-group-instance key="usb" name="USB" register-group-key="usb" address-space-key="data" offset="0x4C0"/>
+            <register-group-instance register-group-key="usb" address-space-key="data" offset="0x4C0"/>
             <signals>
                 <signal pad-id="pd6" function="USB" group="DN"/>
                 <signal pad-id="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -274,7 +274,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -287,7 +287,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -300,7 +300,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -313,7 +313,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -326,7 +326,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -339,14 +339,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pc1" function="TC0" group="OC0B" field="TC0B"/>
@@ -359,14 +359,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TC1" group="OC1A"/>
                 <signal pad-id="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pd1" function="TC0" group="OC0B" field="TC0B"/>
@@ -379,14 +379,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcd1" name="TCD1" module-key="i6090_tc">
-            <register-group-instance key="tcd1" name="TCD1" register-group-key="tc1" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pd4" function="TC1" group="OC1A"/>
                 <signal pad-id="pd5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pe1" function="TC0" group="OC0B" field="TC0B"/>
@@ -399,14 +399,14 @@
             </signals>
         </peripheral>
         <peripheral key="tce1" name="TCE1" module-key="i6090_tc">
-            <register-group-instance key="tce1" name="TCE1" register-group-key="tc1" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pe4" function="TC1" group="OC1A"/>
                 <signal pad-id="pe5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
-            <register-group-instance key="tcf0" name="TCF0" register-group-key="tc0" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TC0" group="OC0A"/>
                 <signal pad-id="pf1" function="TC0" group="OC0B"/>
@@ -415,7 +415,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
-            <register-group-instance key="tcc2" name="TCC2" register-group-key="tc2" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pc1" function="TC2" group="LOC2B"/>
@@ -428,7 +428,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
-            <register-group-instance key="tcd2" name="TCD2" register-group-key="tc2" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pd1" function="TC2" group="LOC2B"/>
@@ -441,7 +441,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
-            <register-group-instance key="tce2" name="TCE2" register-group-key="tc2" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pe1" function="TC2" group="LOC2B"/>
@@ -454,7 +454,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
-            <register-group-instance key="tcf2" name="TCF2" register-group-key="tc2" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pf1" function="TC2" group="LOC2B"/>
@@ -467,7 +467,7 @@
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pc0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pc1" function="AWEX" group="OC0AHS"/>
@@ -480,7 +480,7 @@
             </signals>
         </peripheral>
         <peripheral key="awexe" name="AWEXE" module-key="i6090_awex">
-            <register-group-instance key="awexe" name="AWEXE" register-group-key="awex" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0xA80"/>
             <signals>
                 <signal pad-id="pe0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pe1" function="AWEX" group="OC0AHS"/>
@@ -493,19 +493,19 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="hiresd" name="HIRESD" module-key="i6090_hires">
-            <register-group-instance key="hiresd" name="HIRESD" register-group-key="hires" address-space-key="data" offset="0x990"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x990"/>
         </peripheral>
         <peripheral key="hirese" name="HIRESE" module-key="i6090_hires">
-            <register-group-instance key="hirese" name="HIRESE" register-group-key="hires" address-space-key="data" offset="0xA90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xA90"/>
         </peripheral>
         <peripheral key="hiresf" name="HIRESF" module-key="i6090_hires">
-            <register-group-instance key="hiresf" name="HIRESF" register-group-key="hires" address-space-key="data" offset="0xB90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xB90"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pc2" function="USART" group="RXD" field="USART0"/>
@@ -516,7 +516,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
-            <register-group-instance key="usartc1" name="USARTC1" register-group-key="usart" address-space-key="data" offset="0x8B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8B0"/>
             <signals>
                 <signal pad-id="pd5" function="USART" group="XCK"/>
                 <signal pad-id="pd6" function="USART" group="RXD"/>
@@ -524,7 +524,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
             <signals>
                 <signal pad-id="pd1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pd2" function="USART" group="RXD" field="USART0"/>
@@ -535,7 +535,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd1" name="USARTD1" module-key="i6090_usart">
-            <register-group-instance key="usartd1" name="USARTD1" register-group-key="usart" address-space-key="data" offset="0x9B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9B0"/>
             <signals>
                 <signal pad-id="pd5" function="USART" group="XCK"/>
                 <signal pad-id="pd6" function="USART" group="RXD"/>
@@ -543,7 +543,7 @@
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
             <signals>
                 <signal pad-id="pe1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pe2" function="USART" group="RXD" field="USART0"/>
@@ -554,7 +554,7 @@
             </signals>
         </peripheral>
         <peripheral key="usarte1" name="USARTE1" module-key="i6090_usart">
-            <register-group-instance key="usarte1" name="USARTE1" register-group-key="usart" address-space-key="data" offset="0xAB0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAB0"/>
             <signals>
                 <signal pad-id="pe5" function="USART" group="XCK"/>
                 <signal pad-id="pe6" function="USART" group="RXD"/>
@@ -562,7 +562,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartf0" name="USARTF0" module-key="i6090_usart">
-            <register-group-instance key="usartf0" name="USARTF0" register-group-key="usart" address-space-key="data" offset="0xBA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xBA0"/>
             <signals>
                 <signal pad-id="pf1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pf2" function="USART" group="RXD" field="USART0"/>
@@ -573,7 +573,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pc5" function="SPI" group="MOSI" field="SPI"/>
@@ -586,7 +586,7 @@
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
             <signals>
                 <signal pad-id="pd4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pd5" function="SPI" group="MOSI" field="SPI"/>
@@ -599,7 +599,7 @@
             </signals>
         </peripheral>
         <peripheral key="spie" name="SPIE" module-key="i6090_spi">
-            <register-group-instance key="spie" name="SPIE" register-group-key="spi" address-space-key="data" offset="0xAC0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0xAC0"/>
             <signals>
                 <signal pad-id="pe4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pe5" function="SPI" group="MOSI" field="SPI"/>
@@ -612,16 +612,16 @@
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6570_fuse">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6570_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i6570_sigrow">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192C3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192C3.xml
index a8e81df7..6caf674b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192C3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192C3.xml
@@ -60,88 +60,88 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="i6075_vport">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="i6075_vport">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="i6075_vport">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="i6075_vport">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6110">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
-            <register-group-instance key="usb" name="USB" register-group-key="usb" address-space-key="data" offset="0x4C0"/>
+            <register-group-instance register-group-key="usb" address-space-key="data" offset="0x4C0"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -154,7 +154,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -167,7 +167,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -180,7 +180,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -193,7 +193,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -206,7 +206,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -219,71 +219,71 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
-            <register-group-instance key="tcf0" name="TCF0" register-group-key="tc0" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xB00"/>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
-            <register-group-instance key="tcc2" name="TCC2" register-group-key="tc2" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x800"/>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
-            <register-group-instance key="tcd2" name="TCD2" register-group-key="tc2" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x900"/>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
-            <register-group-instance key="tce2" name="TCE2" register-group-key="tc2" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xA00"/>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
-            <register-group-instance key="tcf2" name="TCF2" register-group-key="tc2" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xB00"/>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6570_fuse">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6570_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i3610">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192D3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192D3.xml
index e876b4d4..89495089 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192D3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192D3.xml
@@ -61,25 +61,25 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
             <signals>
                 <signal pad-id="pr0" function="XTAL" group="XTAL2"/>
                 <signal pad-id="pr1" function="XTAL" group="XTAL1"/>
@@ -88,43 +88,43 @@
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6076">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6076">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i6076">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pa1" index="1" function="AC" group="AC"/>
@@ -139,7 +139,7 @@
             </signals>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6110">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -162,24 +162,24 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWI" group="SDA"/>
                 <signal pad-id="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pe0" function="TWI" group="SDA"/>
                 <signal pad-id="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="port_cfg" name="PORT_CFG" module-key="gpio_port">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
@@ -189,19 +189,19 @@
             </signals>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="gpio_port">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="gpio_port">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="gpio_port">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="gpio_port">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -214,7 +214,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -227,7 +227,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -240,7 +240,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -253,7 +253,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -266,7 +266,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -279,14 +279,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pc1" function="TC0" group="OC0B" field="TC0B"/>
@@ -299,14 +299,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TC1" group="OC1A"/>
                 <signal pad-id="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_tc">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pc0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pc1" function="AWEX" group="OC0AHS"/>
@@ -319,10 +319,10 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_tc">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC0" group="OC0A"/>
                 <signal pad-id="pd1" function="TC0" group="OC0B"/>
@@ -331,7 +331,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC0" group="OC0A"/>
                 <signal pad-id="pe1" function="TC0" group="OC0B"/>
@@ -340,10 +340,10 @@
             </signals>
         </peripheral>
         <peripheral key="awexe" name="AWEXE" module-key="i6090_tc">
-            <register-group-instance key="awexe" name="AWEXE" register-group-key="awex" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0xA80"/>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
-            <register-group-instance key="tcf0" name="TCF0" register-group-key="tc0" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TC0" group="OC0A"/>
                 <signal pad-id="pf1" function="TC0" group="OC0B"/>
@@ -352,7 +352,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
-            <register-group-instance key="tcc2" name="TCC2" register-group-key="tc2" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pc1" function="TC2" group="LOC2B"/>
@@ -365,7 +365,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
-            <register-group-instance key="tcd2" name="TCD2" register-group-key="tc2" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pd1" function="TC2" group="LOC2B"/>
@@ -378,7 +378,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
-            <register-group-instance key="tce2" name="TCE2" register-group-key="tc2" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pe1" function="TC2" group="LOC2B"/>
@@ -391,7 +391,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
-            <register-group-instance key="tcf2" name="TCF2" register-group-key="tc2" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pf1" function="TC2" group="LOC2B"/>
@@ -404,7 +404,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pc2" function="USART" group="RXD" field="USART0"/>
@@ -415,7 +415,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
             <signals>
                 <signal pad-id="pd1" function="USART" group="XCK"/>
                 <signal pad-id="pd2" function="USART" group="RXD"/>
@@ -423,7 +423,7 @@
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
             <signals>
                 <signal pad-id="pe1" function="USART" group="XCK"/>
                 <signal pad-id="pe2" function="USART" group="RXD"/>
@@ -431,7 +431,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pc5" function="SPI" group="MOSI" field="SPI"/>
@@ -444,7 +444,7 @@
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
             <signals>
                 <signal pad-id="pd4" function="SPI" group="SS"/>
                 <signal pad-id="pd5" function="SPI" group="MOSI"/>
@@ -453,10 +453,10 @@
             </signals>
         </peripheral>
         <peripheral key="spie" name="SPIE" module-key="i6090_spi">
-            <register-group-instance key="spie" name="SPIE" register-group-key="spi" address-space-key="data" offset="0xAC0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0xAC0"/>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3.xml
index 23c39b86..2dc2be40 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3.xml
@@ -62,103 +62,103 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="dma" name="DMA" module-key="i3000">
-            <register-group-instance key="dma" name="DMA" register-group-key="dma" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="dma" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6076">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6076">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i6076">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
         </peripheral>
         <peripheral key="acb" name="ACB" module-key="i6077">
-            <register-group-instance key="acb" name="ACB" register-group-key="ac" address-space-key="data" offset="0x390"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x390"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6064">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="adcb" name="ADCB" module-key="i6064">
-            <register-group-instance key="adcb" name="ADCB" register-group-key="adc" address-space-key="data" offset="0x240"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x240"/>
         </peripheral>
         <peripheral key="dacb" name="DACB" module-key="i6059">
-            <register-group-instance key="dacb" name="DACB" register-group-key="dac" address-space-key="data" offset="0x320"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x320"/>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
         </peripheral>
         <peripheral key="port_cfg" name="PORT_CFG" module-key="gpio_port">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="gpio_port">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="gpio_port">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="gpio_port">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="gpio_port">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -171,7 +171,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -184,7 +184,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -197,7 +197,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -210,7 +210,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -223,7 +223,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -236,92 +236,92 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_tc">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_tc">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
         </peripheral>
         <peripheral key="tcd1" name="TCD1" module-key="i6090_tc">
-            <register-group-instance key="tcd1" name="TCD1" register-group-key="tc1" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x940"/>
         </peripheral>
         <peripheral key="hiresd" name="HIRESD" module-key="i6090_tc">
-            <register-group-instance key="hiresd" name="HIRESD" register-group-key="hires" address-space-key="data" offset="0x990"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x990"/>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
         </peripheral>
         <peripheral key="tce1" name="TCE1" module-key="i6090_tc">
-            <register-group-instance key="tce1" name="TCE1" register-group-key="tc1" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0xA40"/>
         </peripheral>
         <peripheral key="awexe" name="AWEXE" module-key="i6090_tc">
-            <register-group-instance key="awexe" name="AWEXE" register-group-key="awex" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0xA80"/>
         </peripheral>
         <peripheral key="hirese" name="HIRESE" module-key="i6090_tc">
-            <register-group-instance key="hirese" name="HIRESE" register-group-key="hires" address-space-key="data" offset="0xA90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xA90"/>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
-            <register-group-instance key="tcf0" name="TCF0" register-group-key="tc0" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xB00"/>
         </peripheral>
         <peripheral key="hiresf" name="HIRESF" module-key="i6090_tc">
-            <register-group-instance key="hiresf" name="HIRESF" register-group-key="hires" address-space-key="data" offset="0xB90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xB90"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
-            <register-group-instance key="usartc1" name="USARTC1" register-group-key="usart" address-space-key="data" offset="0x8B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8B0"/>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
         </peripheral>
         <peripheral key="usartd1" name="USARTD1" module-key="i6090_usart">
-            <register-group-instance key="usartd1" name="USARTD1" register-group-key="usart" address-space-key="data" offset="0x9B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9B0"/>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
         </peripheral>
         <peripheral key="usarte1" name="USARTE1" module-key="i6090_usart">
-            <register-group-instance key="usarte1" name="USARTE1" register-group-key="usart" address-space-key="data" offset="0xAB0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAB0"/>
         </peripheral>
         <peripheral key="usartf0" name="USARTF0" module-key="i6090_usart">
-            <register-group-instance key="usartf0" name="USARTF0" register-group-key="usart" address-space-key="data" offset="0xBA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xBA0"/>
         </peripheral>
         <peripheral key="usartf1" name="USARTF1" module-key="i6090_usart">
-            <register-group-instance key="usartf1" name="USARTF1" register-group-key="usart" address-space-key="data" offset="0xBB0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xBB0"/>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
         </peripheral>
         <peripheral key="spie" name="SPIE" module-key="i6090_spi">
-            <register-group-instance key="spie" name="SPIE" register-group-key="spi" address-space-key="data" offset="0xAC0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0xAC0"/>
         </peripheral>
         <peripheral key="spif" name="SPIF" module-key="i6090_spi">
-            <register-group-instance key="spif" name="SPIF" register-group-key="spi" address-space-key="data" offset="0xBC0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0xBC0"/>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
-            <register-group-instance key="aes" name="AES" register-group-key="aes" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="aes" address-space-key="data" offset="0xC0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3B.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3B.xml
index 9910e440..705d21e4 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3B.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3B.xml
@@ -62,103 +62,103 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="dma" name="DMA" module-key="i3000">
-            <register-group-instance key="dma" name="DMA" register-group-key="dma" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="dma" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6076">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6076">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i6076">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
         </peripheral>
         <peripheral key="acb" name="ACB" module-key="i6077">
-            <register-group-instance key="acb" name="ACB" register-group-key="ac" address-space-key="data" offset="0x390"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x390"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6064">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="adcb" name="ADCB" module-key="i6064">
-            <register-group-instance key="adcb" name="ADCB" register-group-key="adc" address-space-key="data" offset="0x240"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x240"/>
         </peripheral>
         <peripheral key="dacb" name="DACB" module-key="i6059">
-            <register-group-instance key="dacb" name="DACB" register-group-key="dac" address-space-key="data" offset="0x320"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x320"/>
         </peripheral>
         <peripheral key="rtc32" name="RTC32" module-key="i6106">
-            <register-group-instance key="rtc32" name="RTC32" register-group-key="rtc32" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="rtc32" address-space-key="data" offset="0x420"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
         </peripheral>
         <peripheral key="port_cfg" name="PORT_CFG" module-key="gpio_port">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="gpio_port">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="gpio_port">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="gpio_port">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="gpio_port">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -171,7 +171,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -184,7 +184,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -197,7 +197,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -210,7 +210,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -223,7 +223,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -236,86 +236,86 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_tc">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_tc">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
         </peripheral>
         <peripheral key="tcd1" name="TCD1" module-key="i6090_tc">
-            <register-group-instance key="tcd1" name="TCD1" register-group-key="tc1" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x940"/>
         </peripheral>
         <peripheral key="hiresd" name="HIRESD" module-key="i6090_tc">
-            <register-group-instance key="hiresd" name="HIRESD" register-group-key="hires" address-space-key="data" offset="0x990"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x990"/>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
         </peripheral>
         <peripheral key="tce1" name="TCE1" module-key="i6090_tc">
-            <register-group-instance key="tce1" name="TCE1" register-group-key="tc1" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0xA40"/>
         </peripheral>
         <peripheral key="awexe" name="AWEXE" module-key="i6090_tc">
-            <register-group-instance key="awexe" name="AWEXE" register-group-key="awex" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0xA80"/>
         </peripheral>
         <peripheral key="hirese" name="HIRESE" module-key="i6090_tc">
-            <register-group-instance key="hirese" name="HIRESE" register-group-key="hires" address-space-key="data" offset="0xA90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xA90"/>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
-            <register-group-instance key="tcf0" name="TCF0" register-group-key="tc0" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xB00"/>
         </peripheral>
         <peripheral key="hiresf" name="HIRESF" module-key="i6090_tc">
-            <register-group-instance key="hiresf" name="HIRESF" register-group-key="hires" address-space-key="data" offset="0xB90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xB90"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
-            <register-group-instance key="usartc1" name="USARTC1" register-group-key="usart" address-space-key="data" offset="0x8B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8B0"/>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
         </peripheral>
         <peripheral key="usartd1" name="USARTD1" module-key="i6090_usart">
-            <register-group-instance key="usartd1" name="USARTD1" register-group-key="usart" address-space-key="data" offset="0x9B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9B0"/>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
         </peripheral>
         <peripheral key="usartf0" name="USARTF0" module-key="i6090_usart">
-            <register-group-instance key="usartf0" name="USARTF0" register-group-key="usart" address-space-key="data" offset="0xBA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xBA0"/>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
         </peripheral>
         <peripheral key="spif" name="SPIF" module-key="i6090_spi">
-            <register-group-instance key="spif" name="SPIF" register-group-key="spi" address-space-key="data" offset="0xBC0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0xBC0"/>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
-            <register-group-instance key="aes" name="AES" register-group-key="aes" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="aes" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="vbat" name="VBAT" module-key="i6107">
-            <register-group-instance key="vbat" name="VBAT" register-group-key="vbat" address-space-key="data" offset="0xF0"/>
+            <register-group-instance register-group-key="vbat" address-space-key="data" offset="0xF0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3BU.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3BU.xml
index 934833ed..28462e6f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3BU.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3BU.xml
@@ -62,37 +62,37 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="i6075_vport">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="i6075_vport">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="i6075_vport">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="i6075_vport">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
             <signals>
                 <signal pad-id="pr0" function="XTAL" group="XTAL2"/>
                 <signal pad-id="pr1" function="XTAL" group="XTAL1"/>
@@ -101,25 +101,25 @@
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pc7" function="CLKOUTC" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pc4" function="CLKOUTC_ALT" group="CLKOUT" field="CLKEVPIN"/>
@@ -137,28 +137,28 @@
             </signals>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
-            <register-group-instance key="aes" name="AES" register-group-key="aes" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="aes" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="vbat" name="VBAT" module-key="i6107">
-            <register-group-instance key="vbat" name="VBAT" register-group-key="vbat" address-space-key="data" offset="0xF0"/>
+            <register-group-instance register-group-key="vbat" address-space-key="data" offset="0xF0"/>
             <signals>
                 <signal pad-id="vbat" function="VBAT" group="VBAT"/>
             </signals>
         </peripheral>
         <peripheral key="dma" name="DMA" module-key="i3000">
-            <register-group-instance key="dma" name="DMA" register-group-key="dma" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="dma" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6099">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -181,7 +181,7 @@
             </signals>
         </peripheral>
         <peripheral key="adcb" name="ADCB" module-key="i6099">
-            <register-group-instance key="adcb" name="ADCB" register-group-key="adc" address-space-key="data" offset="0x240"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x240"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pb1" index="1" function="ADC" group="ADC"/>
@@ -196,7 +196,7 @@
             </signals>
         </peripheral>
         <peripheral key="dacb" name="DACB" module-key="i6059">
-            <register-group-instance key="dacb" name="DACB" register-group-key="dac" address-space-key="data" offset="0x320"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x320"/>
             <signals>
                 <signal pad-id="pb2" index="0" function="DAC" group="DAC"/>
                 <signal pad-id="pb3" index="1" function="DAC" group="DAC"/>
@@ -205,7 +205,7 @@
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pa1" index="1" function="AC" group="AC"/>
@@ -220,7 +220,7 @@
             </signals>
         </peripheral>
         <peripheral key="acb" name="ACB" module-key="i6077">
-            <register-group-instance key="acb" name="ACB" register-group-key="ac" address-space-key="data" offset="0x390"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x390"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pb1" index="1" function="AC" group="AC"/>
@@ -235,10 +235,10 @@
             </signals>
         </peripheral>
         <peripheral key="rtc32" name="RTC32" module-key="i6106">
-            <register-group-instance key="rtc32" name="RTC32" register-group-key="rtc32" address-space-key="data" offset="0x420"/>
+            <register-group-instance register-group-key="rtc32" address-space-key="data" offset="0x420"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWI" group="SDA"/>
                 <signal pad-id="pc1" function="TWI" group="SCL"/>
@@ -249,21 +249,21 @@
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pe0" function="TWI" group="SDA"/>
                 <signal pad-id="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
-            <register-group-instance key="usb" name="USB" register-group-key="usb" address-space-key="data" offset="0x4C0"/>
+            <register-group-instance register-group-key="usb" address-space-key="data" offset="0x4C0"/>
             <signals>
                 <signal pad-id="pd6" function="USB" group="DN"/>
                 <signal pad-id="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -276,7 +276,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -289,7 +289,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -302,7 +302,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -315,7 +315,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -326,7 +326,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -338,14 +338,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pc1" function="TC0" group="OC0B" field="TC0B"/>
@@ -358,14 +358,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TC1" group="OC1A"/>
                 <signal pad-id="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pd1" function="TC0" group="OC0B" field="TC0B"/>
@@ -378,14 +378,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcd1" name="TCD1" module-key="i6090_tc">
-            <register-group-instance key="tcd1" name="TCD1" register-group-key="tc1" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pd4" function="TC1" group="OC1A"/>
                 <signal pad-id="pd5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC0" group="OC0A"/>
                 <signal pad-id="pe1" function="TC0" group="OC0B"/>
@@ -394,14 +394,14 @@
             </signals>
         </peripheral>
         <peripheral key="tce1" name="TCE1" module-key="i6090_tc">
-            <register-group-instance key="tce1" name="TCE1" register-group-key="tc1" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pe4" function="TC1" group="OC1A"/>
                 <signal pad-id="pe5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
-            <register-group-instance key="tcf0" name="TCF0" register-group-key="tc0" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TC0" group="OC0A"/>
                 <signal pad-id="pf1" function="TC0" group="OC0B"/>
@@ -410,7 +410,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
-            <register-group-instance key="tcc2" name="TCC2" register-group-key="tc2" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pc1" function="TC2" group="LOC2B"/>
@@ -423,7 +423,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
-            <register-group-instance key="tcd2" name="TCD2" register-group-key="tc2" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pd1" function="TC2" group="LOC2B"/>
@@ -436,13 +436,13 @@
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
-            <register-group-instance key="tce2" name="TCE2" register-group-key="tc2" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xA00"/>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
-            <register-group-instance key="tcf2" name="TCF2" register-group-key="tc2" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xB00"/>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pc0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pc1" function="AWEX" group="OC0AHS"/>
@@ -455,22 +455,22 @@
             </signals>
         </peripheral>
         <peripheral key="awexe" name="AWEXE" module-key="i6090_awex">
-            <register-group-instance key="awexe" name="AWEXE" register-group-key="awex" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0xA80"/>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="hiresd" name="HIRESD" module-key="i6090_hires">
-            <register-group-instance key="hiresd" name="HIRESD" register-group-key="hires" address-space-key="data" offset="0x990"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x990"/>
         </peripheral>
         <peripheral key="hirese" name="HIRESE" module-key="i6090_hires">
-            <register-group-instance key="hirese" name="HIRESE" register-group-key="hires" address-space-key="data" offset="0xA90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xA90"/>
         </peripheral>
         <peripheral key="hiresf" name="HIRESF" module-key="i6090_hires">
-            <register-group-instance key="hiresf" name="HIRESF" register-group-key="hires" address-space-key="data" offset="0xB90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xB90"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pc2" function="USART" group="RXD" field="USART0"/>
@@ -481,7 +481,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
-            <register-group-instance key="usartc1" name="USARTC1" register-group-key="usart" address-space-key="data" offset="0x8B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8B0"/>
             <signals>
                 <signal pad-id="pd5" function="USART" group="XCK"/>
                 <signal pad-id="pd6" function="USART" group="RXD"/>
@@ -489,7 +489,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
             <signals>
                 <signal pad-id="pd1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pd2" function="USART" group="RXD" field="USART0"/>
@@ -500,7 +500,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd1" name="USARTD1" module-key="i6090_usart">
-            <register-group-instance key="usartd1" name="USARTD1" register-group-key="usart" address-space-key="data" offset="0x9B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9B0"/>
             <signals>
                 <signal pad-id="pd5" function="USART" group="XCK"/>
                 <signal pad-id="pd6" function="USART" group="RXD"/>
@@ -508,7 +508,7 @@
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
             <signals>
                 <signal pad-id="pe1" function="USART" group="XCK"/>
                 <signal pad-id="pe2" function="USART" group="RXD"/>
@@ -516,7 +516,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartf0" name="USARTF0" module-key="i6090_usart">
-            <register-group-instance key="usartf0" name="USARTF0" register-group-key="usart" address-space-key="data" offset="0xBA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xBA0"/>
             <signals>
                 <signal pad-id="pf1" function="USART" group="XCK"/>
                 <signal pad-id="pf2" function="USART" group="RXD"/>
@@ -524,7 +524,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pc5" function="SPI" group="MOSI" field="SPI"/>
@@ -537,7 +537,7 @@
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
             <signals>
                 <signal pad-id="pd4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pd5" function="SPI" group="MOSI" field="SPI"/>
@@ -550,16 +550,16 @@
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6570_fuse">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6570_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i6570_sigrow">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3U.xml
index fcdade3a..feba7369 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3U.xml
@@ -62,37 +62,37 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="i6075_vport">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="i6075_vport">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="i6075_vport">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="i6075_vport">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
             <signals>
                 <signal pad-id="pr0" function="XTAL" group="XTAL2"/>
                 <signal pad-id="pr1" function="XTAL" group="XTAL1"/>
@@ -101,25 +101,25 @@
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pc7" function="CLKOUTC" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pc4" function="CLKOUTC_ALT" group="CLKOUT" field="CLKEVPIN"/>
@@ -137,22 +137,22 @@
             </signals>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
-            <register-group-instance key="aes" name="AES" register-group-key="aes" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="aes" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="dma" name="DMA" module-key="i3000">
-            <register-group-instance key="dma" name="DMA" register-group-key="dma" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="dma" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6099">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -175,7 +175,7 @@
             </signals>
         </peripheral>
         <peripheral key="adcb" name="ADCB" module-key="i6099">
-            <register-group-instance key="adcb" name="ADCB" register-group-key="adc" address-space-key="data" offset="0x240"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x240"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pb1" index="1" function="ADC" group="ADC"/>
@@ -190,7 +190,7 @@
             </signals>
         </peripheral>
         <peripheral key="dacb" name="DACB" module-key="i6059">
-            <register-group-instance key="dacb" name="DACB" register-group-key="dac" address-space-key="data" offset="0x320"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x320"/>
             <signals>
                 <signal pad-id="pb2" index="0" function="DAC" group="DAC"/>
                 <signal pad-id="pb3" index="1" function="DAC" group="DAC"/>
@@ -199,7 +199,7 @@
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pa1" index="1" function="AC" group="AC"/>
@@ -214,7 +214,7 @@
             </signals>
         </peripheral>
         <peripheral key="acb" name="ACB" module-key="i6077">
-            <register-group-instance key="acb" name="ACB" register-group-key="ac" address-space-key="data" offset="0x390"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x390"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pb1" index="1" function="AC" group="AC"/>
@@ -229,10 +229,10 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWI" group="SDA"/>
                 <signal pad-id="pc1" function="TWI" group="SCL"/>
@@ -243,7 +243,7 @@
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pe0" function="TWI" group="SDA"/>
                 <signal pad-id="pe1" function="TWI" group="SCL"/>
@@ -254,14 +254,14 @@
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
-            <register-group-instance key="usb" name="USB" register-group-key="usb" address-space-key="data" offset="0x4C0"/>
+            <register-group-instance register-group-key="usb" address-space-key="data" offset="0x4C0"/>
             <signals>
                 <signal pad-id="pd6" function="USB" group="DN"/>
                 <signal pad-id="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -274,7 +274,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -287,7 +287,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -300,7 +300,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -313,7 +313,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -326,7 +326,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -339,14 +339,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pc1" function="TC0" group="OC0B" field="TC0B"/>
@@ -359,14 +359,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TC1" group="OC1A"/>
                 <signal pad-id="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pd1" function="TC0" group="OC0B" field="TC0B"/>
@@ -379,14 +379,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcd1" name="TCD1" module-key="i6090_tc">
-            <register-group-instance key="tcd1" name="TCD1" register-group-key="tc1" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pd4" function="TC1" group="OC1A"/>
                 <signal pad-id="pd5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pe1" function="TC0" group="OC0B" field="TC0B"/>
@@ -399,14 +399,14 @@
             </signals>
         </peripheral>
         <peripheral key="tce1" name="TCE1" module-key="i6090_tc">
-            <register-group-instance key="tce1" name="TCE1" register-group-key="tc1" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pe4" function="TC1" group="OC1A"/>
                 <signal pad-id="pe5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
-            <register-group-instance key="tcf0" name="TCF0" register-group-key="tc0" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TC0" group="OC0A"/>
                 <signal pad-id="pf1" function="TC0" group="OC0B"/>
@@ -415,7 +415,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
-            <register-group-instance key="tcc2" name="TCC2" register-group-key="tc2" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pc1" function="TC2" group="LOC2B"/>
@@ -428,7 +428,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
-            <register-group-instance key="tcd2" name="TCD2" register-group-key="tc2" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pd1" function="TC2" group="LOC2B"/>
@@ -441,7 +441,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
-            <register-group-instance key="tce2" name="TCE2" register-group-key="tc2" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pe1" function="TC2" group="LOC2B"/>
@@ -454,7 +454,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
-            <register-group-instance key="tcf2" name="TCF2" register-group-key="tc2" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pf1" function="TC2" group="LOC2B"/>
@@ -467,7 +467,7 @@
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pc0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pc1" function="AWEX" group="OC0AHS"/>
@@ -480,7 +480,7 @@
             </signals>
         </peripheral>
         <peripheral key="awexe" name="AWEXE" module-key="i6090_awex">
-            <register-group-instance key="awexe" name="AWEXE" register-group-key="awex" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0xA80"/>
             <signals>
                 <signal pad-id="pe0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pe1" function="AWEX" group="OC0AHS"/>
@@ -493,19 +493,19 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="hiresd" name="HIRESD" module-key="i6090_hires">
-            <register-group-instance key="hiresd" name="HIRESD" register-group-key="hires" address-space-key="data" offset="0x990"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x990"/>
         </peripheral>
         <peripheral key="hirese" name="HIRESE" module-key="i6090_hires">
-            <register-group-instance key="hirese" name="HIRESE" register-group-key="hires" address-space-key="data" offset="0xA90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xA90"/>
         </peripheral>
         <peripheral key="hiresf" name="HIRESF" module-key="i6090_hires">
-            <register-group-instance key="hiresf" name="HIRESF" register-group-key="hires" address-space-key="data" offset="0xB90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xB90"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pc2" function="USART" group="RXD" field="USART0"/>
@@ -516,7 +516,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
-            <register-group-instance key="usartc1" name="USARTC1" register-group-key="usart" address-space-key="data" offset="0x8B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8B0"/>
             <signals>
                 <signal pad-id="pd5" function="USART" group="XCK"/>
                 <signal pad-id="pd6" function="USART" group="RXD"/>
@@ -524,7 +524,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
             <signals>
                 <signal pad-id="pd1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pd2" function="USART" group="RXD" field="USART0"/>
@@ -535,7 +535,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd1" name="USARTD1" module-key="i6090_usart">
-            <register-group-instance key="usartd1" name="USARTD1" register-group-key="usart" address-space-key="data" offset="0x9B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9B0"/>
             <signals>
                 <signal pad-id="pd5" function="USART" group="XCK"/>
                 <signal pad-id="pd6" function="USART" group="RXD"/>
@@ -543,7 +543,7 @@
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
             <signals>
                 <signal pad-id="pe1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pe2" function="USART" group="RXD" field="USART0"/>
@@ -554,7 +554,7 @@
             </signals>
         </peripheral>
         <peripheral key="usarte1" name="USARTE1" module-key="i6090_usart">
-            <register-group-instance key="usarte1" name="USARTE1" register-group-key="usart" address-space-key="data" offset="0xAB0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAB0"/>
             <signals>
                 <signal pad-id="pe5" function="USART" group="XCK"/>
                 <signal pad-id="pe6" function="USART" group="RXD"/>
@@ -562,7 +562,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartf0" name="USARTF0" module-key="i6090_usart">
-            <register-group-instance key="usartf0" name="USARTF0" register-group-key="usart" address-space-key="data" offset="0xBA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xBA0"/>
             <signals>
                 <signal pad-id="pf1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pf2" function="USART" group="RXD" field="USART0"/>
@@ -573,7 +573,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pc5" function="SPI" group="MOSI" field="SPI"/>
@@ -586,7 +586,7 @@
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
             <signals>
                 <signal pad-id="pd4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pd5" function="SPI" group="MOSI" field="SPI"/>
@@ -599,7 +599,7 @@
             </signals>
         </peripheral>
         <peripheral key="spie" name="SPIE" module-key="i6090_spi">
-            <register-group-instance key="spie" name="SPIE" register-group-key="spi" address-space-key="data" offset="0xAC0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0xAC0"/>
             <signals>
                 <signal pad-id="pe4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pe5" function="SPI" group="MOSI" field="SPI"/>
@@ -612,16 +612,16 @@
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6570_fuse">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6570_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i6570_sigrow">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256C3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256C3.xml
index 73179eb7..99fcc480 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256C3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256C3.xml
@@ -60,37 +60,37 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="i6075_vport">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="i6075_vport">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="i6075_vport">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="i6075_vport">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
             <signals>
                 <signal pad-id="pr0" function="XTAL" group="XTAL2"/>
                 <signal pad-id="pr1" function="XTAL" group="XTAL1"/>
@@ -99,25 +99,25 @@
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
@@ -127,16 +127,16 @@
             </signals>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6110">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -159,7 +159,7 @@
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pa1" index="1" function="AC" group="AC"/>
@@ -174,31 +174,31 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWI" group="SDA"/>
                 <signal pad-id="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pe0" function="TWI" group="SDA"/>
                 <signal pad-id="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
-            <register-group-instance key="usb" name="USB" register-group-key="usb" address-space-key="data" offset="0x4C0"/>
+            <register-group-instance register-group-key="usb" address-space-key="data" offset="0x4C0"/>
             <signals>
                 <signal pad-id="pd6" function="USB" group="DN"/>
                 <signal pad-id="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -211,7 +211,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -224,7 +224,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -237,7 +237,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -250,7 +250,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -263,7 +263,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -276,14 +276,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pc1" function="TC0" group="OC0B" field="TC0B"/>
@@ -296,14 +296,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TC1" group="OC1A"/>
                 <signal pad-id="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC0" group="OC0A"/>
                 <signal pad-id="pd1" function="TC0" group="OC0B"/>
@@ -312,7 +312,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC0" group="OC0A"/>
                 <signal pad-id="pe1" function="TC0" group="OC0B"/>
@@ -321,7 +321,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
-            <register-group-instance key="tcf0" name="TCF0" register-group-key="tc0" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TC0" group="OC0A"/>
                 <signal pad-id="pf1" function="TC0" group="OC0B"/>
@@ -330,7 +330,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
-            <register-group-instance key="tcc2" name="TCC2" register-group-key="tc2" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pc1" function="TC2" group="LOC2B"/>
@@ -343,7 +343,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
-            <register-group-instance key="tcd2" name="TCD2" register-group-key="tc2" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pd1" function="TC2" group="LOC2B"/>
@@ -356,7 +356,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
-            <register-group-instance key="tce2" name="TCE2" register-group-key="tc2" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pe1" function="TC2" group="LOC2B"/>
@@ -369,7 +369,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
-            <register-group-instance key="tcf2" name="TCF2" register-group-key="tc2" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pf1" function="TC2" group="LOC2B"/>
@@ -382,7 +382,7 @@
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pc0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pc1" function="AWEX" group="OC0AHS"/>
@@ -395,10 +395,10 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pc2" function="USART" group="RXD" field="USART0"/>
@@ -409,7 +409,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
             <signals>
                 <signal pad-id="pd1" function="USART" group="XCK"/>
                 <signal pad-id="pd2" function="USART" group="RXD"/>
@@ -417,7 +417,7 @@
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
             <signals>
                 <signal pad-id="pe1" function="USART" group="XCK"/>
                 <signal pad-id="pe2" function="USART" group="RXD"/>
@@ -425,7 +425,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pc5" function="SPI" group="MOSI" field="SPI"/>
@@ -438,7 +438,7 @@
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
             <signals>
                 <signal pad-id="pd4" function="SPI" group="SS"/>
                 <signal pad-id="pd5" function="SPI" group="MOSI"/>
@@ -447,16 +447,16 @@
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6570_fuse">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6570_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i3610">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256D3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256D3.xml
index a0e3895a..41e707fb 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256D3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256D3.xml
@@ -61,25 +61,25 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
             <signals>
                 <signal pad-id="pr0" function="XTAL" group="XTAL2"/>
                 <signal pad-id="pr1" function="XTAL" group="XTAL1"/>
@@ -88,43 +88,43 @@
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6076">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6076">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i6076">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pa1" index="1" function="AC" group="AC"/>
@@ -139,7 +139,7 @@
             </signals>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6110">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -162,24 +162,24 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWI" group="SDA"/>
                 <signal pad-id="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pe0" function="TWI" group="SDA"/>
                 <signal pad-id="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="port_cfg" name="PORT_CFG" module-key="gpio_port">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
@@ -189,19 +189,19 @@
             </signals>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="gpio_port">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="gpio_port">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="gpio_port">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="gpio_port">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -214,7 +214,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -227,7 +227,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -240,7 +240,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -253,7 +253,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -266,7 +266,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -279,14 +279,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pc1" function="TC0" group="OC0B" field="TC0B"/>
@@ -299,14 +299,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TC1" group="OC1A"/>
                 <signal pad-id="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_tc">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pc0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pc1" function="AWEX" group="OC0AHS"/>
@@ -319,10 +319,10 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_tc">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC0" group="OC0A"/>
                 <signal pad-id="pd1" function="TC0" group="OC0B"/>
@@ -331,7 +331,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC0" group="OC0A"/>
                 <signal pad-id="pe1" function="TC0" group="OC0B"/>
@@ -340,10 +340,10 @@
             </signals>
         </peripheral>
         <peripheral key="awexe" name="AWEXE" module-key="i6090_tc">
-            <register-group-instance key="awexe" name="AWEXE" register-group-key="awex" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0xA80"/>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
-            <register-group-instance key="tcf0" name="TCF0" register-group-key="tc0" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TC0" group="OC0A"/>
                 <signal pad-id="pf1" function="TC0" group="OC0B"/>
@@ -352,7 +352,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
-            <register-group-instance key="tcc2" name="TCC2" register-group-key="tc2" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pc1" function="TC2" group="LOC2B"/>
@@ -365,7 +365,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
-            <register-group-instance key="tcd2" name="TCD2" register-group-key="tc2" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pd1" function="TC2" group="LOC2B"/>
@@ -378,7 +378,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
-            <register-group-instance key="tce2" name="TCE2" register-group-key="tc2" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pe1" function="TC2" group="LOC2B"/>
@@ -391,7 +391,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
-            <register-group-instance key="tcf2" name="TCF2" register-group-key="tc2" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pf1" function="TC2" group="LOC2B"/>
@@ -404,7 +404,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pc2" function="USART" group="RXD" field="USART0"/>
@@ -415,7 +415,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
             <signals>
                 <signal pad-id="pd1" function="USART" group="XCK"/>
                 <signal pad-id="pd2" function="USART" group="RXD"/>
@@ -423,7 +423,7 @@
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
             <signals>
                 <signal pad-id="pe1" function="USART" group="XCK"/>
                 <signal pad-id="pe2" function="USART" group="RXD"/>
@@ -431,7 +431,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pc5" function="SPI" group="MOSI" field="SPI"/>
@@ -444,7 +444,7 @@
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
             <signals>
                 <signal pad-id="pd4" function="SPI" group="SS"/>
                 <signal pad-id="pd5" function="SPI" group="MOSI"/>
@@ -453,10 +453,10 @@
             </signals>
         </peripheral>
         <peripheral key="spie" name="SPIE" module-key="i6090_spi">
-            <register-group-instance key="spie" name="SPIE" register-group-key="spi" address-space-key="data" offset="0xAC0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0xAC0"/>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4.xml
index 8a32afc4..9ca3be14 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4.xml
@@ -61,97 +61,97 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="dma" name="DMA" module-key="i3000">
-            <register-group-instance key="dma" name="DMA" register-group-key="dma" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="dma" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6076">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6076">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i6076">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6064">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="dacb" name="DACB" module-key="i6059">
-            <register-group-instance key="dacb" name="DACB" register-group-key="dac" address-space-key="data" offset="0x320"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x320"/>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
         </peripheral>
         <peripheral key="port_cfg" name="PORT_CFG" module-key="gpio_port">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="gpio_port">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="gpio_port">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="gpio_port">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="gpio_port">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -164,7 +164,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -173,7 +173,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -186,7 +186,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -199,7 +199,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -208,65 +208,65 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_tc">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_tc">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
         </peripheral>
         <peripheral key="tcd1" name="TCD1" module-key="i6090_tc">
-            <register-group-instance key="tcd1" name="TCD1" register-group-key="tc1" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x940"/>
         </peripheral>
         <peripheral key="hiresd" name="HIRESD" module-key="i6090_tc">
-            <register-group-instance key="hiresd" name="HIRESD" register-group-key="hires" address-space-key="data" offset="0x990"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x990"/>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
         </peripheral>
         <peripheral key="hirese" name="HIRESE" module-key="i6090_tc">
-            <register-group-instance key="hirese" name="HIRESE" register-group-key="hires" address-space-key="data" offset="0xA90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xA90"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
-            <register-group-instance key="usartc1" name="USARTC1" register-group-key="usart" address-space-key="data" offset="0x8B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8B0"/>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
         </peripheral>
         <peripheral key="usartd1" name="USARTD1" module-key="i6090_usart">
-            <register-group-instance key="usartd1" name="USARTD1" register-group-key="usart" address-space-key="data" offset="0x9B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9B0"/>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
-            <register-group-instance key="aes" name="AES" register-group-key="aes" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="aes" address-space-key="data" offset="0xC0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4U.xml
index b22e190f..97328cd0 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4U.xml
@@ -60,37 +60,37 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="i6075_vport">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="i6075_vport">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="i6075_vport">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="i6075_vport">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
             <signals>
                 <signal pad-id="pr0" function="XTAL" group="XTAL2"/>
                 <signal pad-id="pr1" function="XTAL" group="XTAL1"/>
@@ -101,25 +101,25 @@
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pc7" function="CLKOUTC" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pc4" function="CLKOUTC_ALT" group="CLKOUT" field="CLKEVPIN"/>
@@ -133,22 +133,22 @@
             </signals>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
-            <register-group-instance key="aes" name="AES" register-group-key="aes" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="aes" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="dma" name="DMA" module-key="i3000">
-            <register-group-instance key="dma" name="DMA" register-group-key="dma" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="dma" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6099">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -167,7 +167,7 @@
             </signals>
         </peripheral>
         <peripheral key="dacb" name="DACB" module-key="i6059">
-            <register-group-instance key="dacb" name="DACB" register-group-key="dac" address-space-key="data" offset="0x320"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x320"/>
             <signals>
                 <signal pad-id="pb2" index="0" function="DAC" group="DAC"/>
                 <signal pad-id="pb3" index="1" function="DAC" group="DAC"/>
@@ -176,7 +176,7 @@
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pa1" index="1" function="AC" group="AC"/>
@@ -191,10 +191,10 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWI" group="SDA"/>
                 <signal pad-id="pc1" function="TWI" group="SCL"/>
@@ -205,21 +205,21 @@
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pe0" function="TWI" group="SDA"/>
                 <signal pad-id="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
-            <register-group-instance key="usb" name="USB" register-group-key="usb" address-space-key="data" offset="0x4C0"/>
+            <register-group-instance register-group-key="usb" address-space-key="data" offset="0x4C0"/>
             <signals>
                 <signal pad-id="pd6" function="USB" group="DN"/>
                 <signal pad-id="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -232,7 +232,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -241,7 +241,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -254,7 +254,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -267,7 +267,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -276,14 +276,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pc1" function="TC0" group="OC0B" field="TC0B"/>
@@ -296,14 +296,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TC1" group="OC1A"/>
                 <signal pad-id="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC0" group="OC0A"/>
                 <signal pad-id="pd1" function="TC0" group="OC0B"/>
@@ -316,14 +316,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcd1" name="TCD1" module-key="i6090_tc">
-            <register-group-instance key="tcd1" name="TCD1" register-group-key="tc1" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pd4" function="TC1" group="OC1A"/>
                 <signal pad-id="pd5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC0" group="OC0A"/>
                 <signal pad-id="pe1" function="TC0" group="OC0B"/>
@@ -332,7 +332,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
-            <register-group-instance key="tcc2" name="TCC2" register-group-key="tc2" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pc1" function="TC2" group="LOC2B"/>
@@ -345,7 +345,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
-            <register-group-instance key="tcd2" name="TCD2" register-group-key="tc2" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pd1" function="TC2" group="LOC2B"/>
@@ -358,7 +358,7 @@
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pc0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pc1" function="AWEX" group="OC0AHS"/>
@@ -371,16 +371,16 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="hiresd" name="HIRESD" module-key="i6090_hires">
-            <register-group-instance key="hiresd" name="HIRESD" register-group-key="hires" address-space-key="data" offset="0x990"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x990"/>
         </peripheral>
         <peripheral key="hirese" name="HIRESE" module-key="i6090_hires">
-            <register-group-instance key="hirese" name="HIRESE" register-group-key="hires" address-space-key="data" offset="0xA90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xA90"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pc2" function="USART" group="RXD" field="USART0"/>
@@ -391,7 +391,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
-            <register-group-instance key="usartc1" name="USARTC1" register-group-key="usart" address-space-key="data" offset="0x8B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8B0"/>
             <signals>
                 <signal pad-id="pd5" function="USART" group="XCK"/>
                 <signal pad-id="pd6" function="USART" group="RXD"/>
@@ -399,7 +399,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
             <signals>
                 <signal pad-id="pd1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pd2" function="USART" group="RXD" field="USART0"/>
@@ -410,7 +410,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd1" name="USARTD1" module-key="i6090_usart">
-            <register-group-instance key="usartd1" name="USARTD1" register-group-key="usart" address-space-key="data" offset="0x9B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9B0"/>
             <signals>
                 <signal pad-id="pd5" function="USART" group="XCK"/>
                 <signal pad-id="pd6" function="USART" group="RXD"/>
@@ -418,7 +418,7 @@
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
             <signals>
                 <signal pad-id="pe1" function="USART" group="XCK"/>
                 <signal pad-id="pe2" function="USART" group="RXD"/>
@@ -426,7 +426,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pc5" function="SPI" group="MOSI" field="SPI"/>
@@ -439,7 +439,7 @@
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
             <signals>
                 <signal pad-id="pd4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pd5" function="SPI" group="MOSI" field="SPI"/>
@@ -452,16 +452,16 @@
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6570_fuse">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6570_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i6570_sigrow">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32C3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32C3.xml
index 15a8bb10..3c0aba31 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32C3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32C3.xml
@@ -60,37 +60,37 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="i6075_vport">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="i6075_vport">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="i6075_vport">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="i6075_vport">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
             <signals>
                 <signal pad-id="pr0" function="XTAL" group="XTAL2"/>
                 <signal pad-id="pr1" function="XTAL" group="XTAL1"/>
@@ -99,25 +99,25 @@
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
@@ -127,16 +127,16 @@
             </signals>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6110">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -159,7 +159,7 @@
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pa1" index="1" function="AC" group="AC"/>
@@ -174,31 +174,31 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWI" group="SDA"/>
                 <signal pad-id="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pe0" function="TWI" group="SDA"/>
                 <signal pad-id="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
-            <register-group-instance key="usb" name="USB" register-group-key="usb" address-space-key="data" offset="0x4C0"/>
+            <register-group-instance register-group-key="usb" address-space-key="data" offset="0x4C0"/>
             <signals>
                 <signal pad-id="pd6" function="USB" group="DN"/>
                 <signal pad-id="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -211,7 +211,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -224,7 +224,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -237,7 +237,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -250,7 +250,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -263,7 +263,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -276,14 +276,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pc1" function="TC0" group="OC0B" field="TC0B"/>
@@ -296,14 +296,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TC1" group="OC1A"/>
                 <signal pad-id="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC0" group="OC0A"/>
                 <signal pad-id="pd1" function="TC0" group="OC0B"/>
@@ -312,7 +312,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC0" group="OC0A"/>
                 <signal pad-id="pe1" function="TC0" group="OC0B"/>
@@ -321,7 +321,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
-            <register-group-instance key="tcf0" name="TCF0" register-group-key="tc0" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TC0" group="OC0A"/>
                 <signal pad-id="pf1" function="TC0" group="OC0B"/>
@@ -330,7 +330,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
-            <register-group-instance key="tcc2" name="TCC2" register-group-key="tc2" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pc1" function="TC2" group="LOC2B"/>
@@ -343,7 +343,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
-            <register-group-instance key="tcd2" name="TCD2" register-group-key="tc2" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pd1" function="TC2" group="LOC2B"/>
@@ -356,7 +356,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
-            <register-group-instance key="tce2" name="TCE2" register-group-key="tc2" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pe1" function="TC2" group="LOC2B"/>
@@ -369,7 +369,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
-            <register-group-instance key="tcf2" name="TCF2" register-group-key="tc2" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pf1" function="TC2" group="LOC2B"/>
@@ -382,7 +382,7 @@
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pc0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pc1" function="AWEX" group="OC0AHS"/>
@@ -395,10 +395,10 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pc2" function="USART" group="RXD" field="USART0"/>
@@ -409,7 +409,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
             <signals>
                 <signal pad-id="pd1" function="USART" group="XCK"/>
                 <signal pad-id="pd2" function="USART" group="RXD"/>
@@ -417,7 +417,7 @@
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
             <signals>
                 <signal pad-id="pe1" function="USART" group="XCK"/>
                 <signal pad-id="pe2" function="USART" group="RXD"/>
@@ -425,7 +425,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pc5" function="SPI" group="MOSI" field="SPI"/>
@@ -438,7 +438,7 @@
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
             <signals>
                 <signal pad-id="pd4" function="SPI" group="SS"/>
                 <signal pad-id="pd5" function="SPI" group="MOSI"/>
@@ -447,16 +447,16 @@
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6570_fuse">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6570_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i3610">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32C4.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32C4.xml
index 9b01b415..e6de0894 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32C4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32C4.xml
@@ -60,37 +60,37 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="i6075_vport">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="i6075_vport">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="i6075_vport">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="i6075_vport">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
             <signals>
                 <signal pad-id="pr0" function="XTAL" group="XTAL2"/>
                 <signal pad-id="pr1" function="XTAL" group="XTAL1"/>
@@ -101,25 +101,25 @@
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
@@ -129,16 +129,16 @@
             </signals>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6110">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -157,7 +157,7 @@
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pa1" index="1" function="AC" group="AC"/>
@@ -171,31 +171,31 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWI" group="SDA"/>
                 <signal pad-id="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pe0" function="TWI" group="SDA"/>
                 <signal pad-id="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
-            <register-group-instance key="usb" name="USB" register-group-key="usb" address-space-key="data" offset="0x4C0"/>
+            <register-group-instance register-group-key="usb" address-space-key="data" offset="0x4C0"/>
             <signals>
                 <signal pad-id="pd6" function="USB" group="DN"/>
                 <signal pad-id="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -208,7 +208,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -217,7 +217,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -230,7 +230,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -243,7 +243,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -252,14 +252,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TCC" group="OC0A" field="TC0A"/>
                 <signal pad-id="pc1" function="TCC" group="OC0B" field="TC0B"/>
@@ -272,14 +272,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TCC" group="OC1A"/>
                 <signal pad-id="pc5" function="TCC" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC0" group="OC0A"/>
                 <signal pad-id="pd1" function="TC0" group="OC0B"/>
@@ -288,7 +288,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TCE" group="OC0A"/>
                 <signal pad-id="pe1" function="TCE" group="OC0B"/>
@@ -297,7 +297,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
-            <register-group-instance key="tcc2" name="TCC2" register-group-key="tc2" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pc1" function="TC2" group="LOC2B"/>
@@ -310,7 +310,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
-            <register-group-instance key="tcd2" name="TCD2" register-group-key="tc2" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pd1" function="TC2" group="LOC2B"/>
@@ -323,7 +323,7 @@
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pc0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pc1" function="AWEX" group="OC0AHS"/>
@@ -336,10 +336,10 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pc2" function="USART" group="RXD" field="USART0"/>
@@ -350,7 +350,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
-            <register-group-instance key="usartc1" name="USARTC1" register-group-key="usart" address-space-key="data" offset="0x8B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8B0"/>
             <signals>
                 <signal pad-id="pc5" function="USART" group="XCK"/>
                 <signal pad-id="pc6" function="USART" group="RXD"/>
@@ -358,7 +358,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
             <signals>
                 <signal pad-id="pd1" function="USART" group="XCK"/>
                 <signal pad-id="pd2" function="USART" group="RXD"/>
@@ -366,7 +366,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pc5" function="SPI" group="MOSI" field="SPI"/>
@@ -379,7 +379,7 @@
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
             <signals>
                 <signal pad-id="pd4" function="SPI" group="SS"/>
                 <signal pad-id="pd5" function="SPI" group="MOSI"/>
@@ -388,16 +388,16 @@
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6570_fuse">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6570_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i3610">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32D3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32D3.xml
index 811052bc..f8cd47d1 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32D3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32D3.xml
@@ -61,25 +61,25 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
             <signals>
                 <signal pad-id="pr0" function="XTAL" group="XTAL2"/>
                 <signal pad-id="pr1" function="XTAL" group="XTAL1"/>
@@ -88,43 +88,43 @@
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6076">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6076">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i6076">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pa1" index="1" function="AC" group="AC"/>
@@ -139,7 +139,7 @@
             </signals>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6110">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -162,24 +162,24 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWI" group="SDA"/>
                 <signal pad-id="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pe0" function="TWI" group="SDA"/>
                 <signal pad-id="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="port_cfg" name="PORT_CFG" module-key="gpio_port">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
@@ -189,19 +189,19 @@
             </signals>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="gpio_port">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="gpio_port">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="gpio_port">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="gpio_port">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -214,7 +214,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -227,7 +227,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -240,7 +240,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -253,7 +253,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -266,7 +266,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -279,14 +279,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pc1" function="TC0" group="OC0B" field="TC0B"/>
@@ -299,14 +299,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TC1" group="OC1A"/>
                 <signal pad-id="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_tc">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pc0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pc1" function="AWEX" group="OC0AHS"/>
@@ -319,10 +319,10 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_tc">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC0" group="OC0A"/>
                 <signal pad-id="pd1" function="TC0" group="OC0B"/>
@@ -331,7 +331,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC0" group="OC0A"/>
                 <signal pad-id="pe1" function="TC0" group="OC0B"/>
@@ -340,10 +340,10 @@
             </signals>
         </peripheral>
         <peripheral key="awexe" name="AWEXE" module-key="i6090_tc">
-            <register-group-instance key="awexe" name="AWEXE" register-group-key="awex" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0xA80"/>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
-            <register-group-instance key="tcf0" name="TCF0" register-group-key="tc0" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TC0" group="OC0A"/>
                 <signal pad-id="pf1" function="TC0" group="OC0B"/>
@@ -352,7 +352,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
-            <register-group-instance key="tcc2" name="TCC2" register-group-key="tc2" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pc1" function="TC2" group="LOC2B"/>
@@ -365,7 +365,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
-            <register-group-instance key="tcd2" name="TCD2" register-group-key="tc2" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pd1" function="TC2" group="LOC2B"/>
@@ -378,7 +378,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
-            <register-group-instance key="tce2" name="TCE2" register-group-key="tc2" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pe1" function="TC2" group="LOC2B"/>
@@ -391,7 +391,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
-            <register-group-instance key="tcf2" name="TCF2" register-group-key="tc2" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pf1" function="TC2" group="LOC2B"/>
@@ -404,7 +404,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pc2" function="USART" group="RXD" field="USART0"/>
@@ -415,7 +415,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
             <signals>
                 <signal pad-id="pd1" function="USART" group="XCK"/>
                 <signal pad-id="pd2" function="USART" group="RXD"/>
@@ -423,7 +423,7 @@
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
             <signals>
                 <signal pad-id="pe1" function="USART" group="XCK"/>
                 <signal pad-id="pe2" function="USART" group="RXD"/>
@@ -431,7 +431,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pc5" function="SPI" group="MOSI" field="SPI"/>
@@ -444,7 +444,7 @@
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
             <signals>
                 <signal pad-id="pd4" function="SPI" group="SS"/>
                 <signal pad-id="pd5" function="SPI" group="MOSI"/>
@@ -453,10 +453,10 @@
             </signals>
         </peripheral>
         <peripheral key="spie" name="SPIE" module-key="i6090_spi">
-            <register-group-instance key="spie" name="SPIE" register-group-key="spi" address-space-key="data" offset="0xAC0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0xAC0"/>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32D4.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32D4.xml
index 268be82e..940965aa 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32D4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32D4.xml
@@ -61,25 +61,25 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
             <signals>
                 <signal pad-id="pr0" function="XTAL" group="XTAL2"/>
                 <signal pad-id="pr1" function="XTAL" group="XTAL1"/>
@@ -90,43 +90,43 @@
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6076">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6076">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i6076">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pa1" index="1" function="AC" group="AC"/>
@@ -140,7 +140,7 @@
             </signals>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6099">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -159,24 +159,24 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWI" group="SDA"/>
                 <signal pad-id="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pe0" function="TWI" group="SDA"/>
                 <signal pad-id="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="port_cfg" name="PORT_CFG" module-key="gpio_port">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
@@ -186,19 +186,19 @@
             </signals>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="gpio_port">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="gpio_port">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="gpio_port">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="gpio_port">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -211,7 +211,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -220,7 +220,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -233,7 +233,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -246,7 +246,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -255,14 +255,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TCC" group="OC0A" field="TC0A"/>
                 <signal pad-id="pc1" function="TCC" group="OC0B" field="TC0B"/>
@@ -275,14 +275,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TCC" group="OC1A"/>
                 <signal pad-id="pc5" function="TCC" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_tc">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pc0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pc1" function="AWEX" group="OC0AHS"/>
@@ -295,10 +295,10 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_tc">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TCC" group="OC0A"/>
                 <signal pad-id="pd1" function="TCC" group="OC0B"/>
@@ -307,7 +307,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TCE" group="OC0A"/>
                 <signal pad-id="pe1" function="TCE" group="OC0B"/>
@@ -316,7 +316,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
-            <register-group-instance key="tcc2" name="TCC2" register-group-key="tc2" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TCC2" group="LOC2A"/>
                 <signal pad-id="pc1" function="TCC2" group="LOC2B"/>
@@ -329,7 +329,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pc2" function="USART" group="RXD" field="USART0"/>
@@ -340,7 +340,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
             <signals>
                 <signal pad-id="pd1" function="USART" group="XCK"/>
                 <signal pad-id="pd2" function="USART" group="RXD"/>
@@ -348,7 +348,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pc5" function="SPI" group="MOSI" field="SPI"/>
@@ -361,7 +361,7 @@
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
             <signals>
                 <signal pad-id="pd4" function="SPI" group="SS"/>
                 <signal pad-id="pd5" function="SPI" group="MOSI"/>
@@ -370,7 +370,7 @@
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32E5.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32E5.xml
index d96d4cf4..5581ce8c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32E5.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32E5.xml
@@ -60,40 +60,40 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="i6075_vport">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="i6075_vport">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="i6075_vport">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="i6075_vport">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pc4" function="EXTERNAL_CLOCK" group="EXTCLK"/>
             </signals>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
             <signals>
                 <signal pad-id="pr0" function="XTAL" group="XTAL2"/>
                 <signal pad-id="pr1" function="XTAL" group="XTAL1"/>
@@ -102,22 +102,22 @@
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pd7" function="CLKOUTD" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pd4" function="CLKOUTD_ALT" group="CLKOUT" field="CLKEVPIN"/>
@@ -130,19 +130,19 @@
             </signals>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="edma" name="EDMA" module-key="i3002">
-            <register-group-instance key="edma" name="EDMA" register-group-key="edma" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="edma" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i3620_nvm">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6110">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -165,7 +165,7 @@
             </signals>
         </peripheral>
         <peripheral key="daca" name="DACA" module-key="i6059">
-            <register-group-instance key="daca" name="DACA" register-group-key="dac" address-space-key="data" offset="0x300"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x300"/>
             <signals>
                 <signal pad-id="pa2" index="0" function="DAC" group="DAC"/>
                 <signal pad-id="pa3" index="1" function="DAC" group="DAC"/>
@@ -174,7 +174,7 @@
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pa1" index="1" function="AC" group="AC"/>
@@ -195,10 +195,10 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="xcl" name="XCL" module-key="i3008">
-            <register-group-instance key="xcl" name="XCL" register-group-key="xcl" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="xcl" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pc0" index="1" function="XCLIN_LSB_PC" group="IN"/>
                 <signal pad-id="pc1" index="2" function="XCLIN_LSB_PC" group="IN"/>
@@ -225,7 +225,7 @@
             </signals>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWI" group="SDA"/>
                 <signal pad-id="pc1" function="TWI" group="SCL"/>
@@ -234,7 +234,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -247,7 +247,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -260,7 +260,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -273,14 +273,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc4" name="TCC4" module-key="i3007_tc">
-            <register-group-instance key="tcc4" name="TCC4" register-group-key="tc4" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc4" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC4" group="OC4A" field="TC4A"/>
                 <signal pad-id="pc1" function="TC4" group="OC4B" field="TC4B"/>
@@ -293,27 +293,27 @@
             </signals>
         </peripheral>
         <peripheral key="tcc5" name="TCC5" module-key="i3007_tc">
-            <register-group-instance key="tcc5" name="TCC5" register-group-key="tc5" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc5" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TC5" group="OC5A"/>
                 <signal pad-id="pc5" function="TC5" group="OC5B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd5" name="TCD5" module-key="i3007_tc">
-            <register-group-instance key="tcd5" name="TCD5" register-group-key="tc5" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="tc5" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pd4" function="TC5" group="OC5A"/>
                 <signal pad-id="pd5" function="TC5" group="OC5B"/>
             </signals>
         </peripheral>
         <peripheral key="faultc4" name="FAULTC4" module-key="i3620_fault">
-            <register-group-instance key="faultc4" name="FAULTC4" register-group-key="fault" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="fault" address-space-key="data" offset="0x880"/>
         </peripheral>
         <peripheral key="faultc5" name="FAULTC5" module-key="i3620_fault">
-            <register-group-instance key="faultc5" name="FAULTC5" register-group-key="fault" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="fault" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="wexc" name="WEXC" module-key="i3007_wex">
-            <register-group-instance key="wexc" name="WEXC" register-group-key="wex" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="wex" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc0" function="WEX" group="OC4ALS"/>
                 <signal pad-id="pc1" function="WEX" group="OC4AHS"/>
@@ -326,10 +326,10 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i3620_hires">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x8B0"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x8B0"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i4000">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pc2" function="USART" group="RXD" field="USART0"/>
@@ -340,7 +340,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i4000">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9C0"/>
             <signals>
                 <signal pad-id="pd1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pd2" function="USART" group="RXD" field="USART0"/>
@@ -351,7 +351,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8E0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8E0"/>
             <signals>
                 <signal pad-id="pc4" function="SPI" group="SS"/>
                 <signal pad-id="pc5" function="SPI" group="SCK"/>
@@ -360,16 +360,16 @@
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i3620_fuse">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i3620_fuse">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i3620_sigrow">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA384C3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA384C3.xml
index 3aa8ee8d..a2540cce 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA384C3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA384C3.xml
@@ -60,37 +60,37 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="i6075_vport">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="i6075_vport">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="i6075_vport">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="i6075_vport">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
             <signals>
                 <signal pad-id="pr0" function="XTAL" group="XTAL2"/>
                 <signal pad-id="pr1" function="XTAL" group="XTAL1"/>
@@ -99,25 +99,25 @@
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
@@ -127,22 +127,22 @@
             </signals>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
-            <register-group-instance key="aes" name="AES" register-group-key="aes" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="aes" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="dma" name="DMA" module-key="i3000">
-            <register-group-instance key="dma" name="DMA" register-group-key="dma" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="dma" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6110">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -165,7 +165,7 @@
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pa1" index="1" function="AC" group="AC"/>
@@ -180,31 +180,31 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWI" group="SDA"/>
                 <signal pad-id="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pe0" function="TWI" group="SDA"/>
                 <signal pad-id="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
-            <register-group-instance key="usb" name="USB" register-group-key="usb" address-space-key="data" offset="0x4C0"/>
+            <register-group-instance register-group-key="usb" address-space-key="data" offset="0x4C0"/>
             <signals>
                 <signal pad-id="pd6" function="USB" group="DN"/>
                 <signal pad-id="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -217,7 +217,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -230,7 +230,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -243,7 +243,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -256,7 +256,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -269,7 +269,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -282,14 +282,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pc1" function="TC0" group="OC0B" field="TC0B"/>
@@ -302,14 +302,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TC1" group="OC1A"/>
                 <signal pad-id="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC0" group="OC0A"/>
                 <signal pad-id="pd1" function="TC0" group="OC0B"/>
@@ -318,7 +318,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC0" group="OC0A"/>
                 <signal pad-id="pe1" function="TC0" group="OC0B"/>
@@ -327,7 +327,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
-            <register-group-instance key="tcf0" name="TCF0" register-group-key="tc0" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TC0" group="OC0A"/>
                 <signal pad-id="pf1" function="TC0" group="OC0B"/>
@@ -336,7 +336,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
-            <register-group-instance key="tcc2" name="TCC2" register-group-key="tc2" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pc1" function="TC2" group="LOC2B"/>
@@ -349,7 +349,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
-            <register-group-instance key="tcd2" name="TCD2" register-group-key="tc2" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pd1" function="TC2" group="LOC2B"/>
@@ -362,7 +362,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
-            <register-group-instance key="tce2" name="TCE2" register-group-key="tc2" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pe1" function="TC2" group="LOC2B"/>
@@ -375,7 +375,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
-            <register-group-instance key="tcf2" name="TCF2" register-group-key="tc2" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pf1" function="TC2" group="LOC2B"/>
@@ -388,7 +388,7 @@
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pc0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pc1" function="AWEX" group="OC0AHS"/>
@@ -401,10 +401,10 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pc2" function="USART" group="RXD" field="USART0"/>
@@ -415,7 +415,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
             <signals>
                 <signal pad-id="pd1" function="USART" group="XCK"/>
                 <signal pad-id="pd2" function="USART" group="RXD"/>
@@ -423,7 +423,7 @@
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
             <signals>
                 <signal pad-id="pe1" function="USART" group="XCK"/>
                 <signal pad-id="pe2" function="USART" group="RXD"/>
@@ -431,7 +431,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pc5" function="SPI" group="MOSI" field="SPI"/>
@@ -444,7 +444,7 @@
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
             <signals>
                 <signal pad-id="pd4" function="SPI" group="SS"/>
                 <signal pad-id="pd5" function="SPI" group="MOSI"/>
@@ -453,16 +453,16 @@
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6570_fuse">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6570_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i3610">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA384D3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA384D3.xml
index 80d25d09..65a54c4e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA384D3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA384D3.xml
@@ -60,37 +60,37 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="i6075_vport">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="i6075_vport">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="i6075_vport">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="i6075_vport">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
             <signals>
                 <signal pad-id="pr0" function="XTAL" group="XTAL2"/>
                 <signal pad-id="pr1" function="XTAL" group="XTAL1"/>
@@ -99,25 +99,25 @@
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
@@ -127,16 +127,16 @@
             </signals>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6110">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -159,7 +159,7 @@
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pa1" index="1" function="AC" group="AC"/>
@@ -174,24 +174,24 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWI" group="SDA"/>
                 <signal pad-id="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pe0" function="TWI" group="SDA"/>
                 <signal pad-id="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -204,7 +204,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -217,7 +217,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -230,7 +230,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -243,7 +243,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -256,7 +256,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -269,14 +269,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pc1" function="TC0" group="OC0B" field="TC0B"/>
@@ -289,14 +289,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TC1" group="OC1A"/>
                 <signal pad-id="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC0" group="OC0A"/>
                 <signal pad-id="pd1" function="TC0" group="OC0B"/>
@@ -305,7 +305,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC0" group="OC0A"/>
                 <signal pad-id="pe1" function="TC0" group="OC0B"/>
@@ -314,7 +314,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
-            <register-group-instance key="tcf0" name="TCF0" register-group-key="tc0" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TC0" group="OC0A"/>
                 <signal pad-id="pf1" function="TC0" group="OC0B"/>
@@ -323,7 +323,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
-            <register-group-instance key="tcc2" name="TCC2" register-group-key="tc2" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pc1" function="TC2" group="LOC2B"/>
@@ -336,7 +336,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
-            <register-group-instance key="tcd2" name="TCD2" register-group-key="tc2" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pd1" function="TC2" group="LOC2B"/>
@@ -349,7 +349,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
-            <register-group-instance key="tce2" name="TCE2" register-group-key="tc2" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pe1" function="TC2" group="LOC2B"/>
@@ -362,7 +362,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
-            <register-group-instance key="tcf2" name="TCF2" register-group-key="tc2" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pf1" function="TC2" group="LOC2B"/>
@@ -375,7 +375,7 @@
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pc0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pc1" function="AWEX" group="OC0AHS"/>
@@ -388,10 +388,10 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pc2" function="USART" group="RXD" field="USART0"/>
@@ -402,7 +402,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
             <signals>
                 <signal pad-id="pd1" function="USART" group="XCK"/>
                 <signal pad-id="pd2" function="USART" group="RXD"/>
@@ -410,7 +410,7 @@
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
             <signals>
                 <signal pad-id="pe1" function="USART" group="XCK"/>
                 <signal pad-id="pe2" function="USART" group="RXD"/>
@@ -418,7 +418,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartf0" name="USARTF0" module-key="i6090_usart">
-            <register-group-instance key="usartf0" name="USARTF0" register-group-key="usart" address-space-key="data" offset="0xBA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xBA0"/>
             <signals>
                 <signal pad-id="pf1" function="USART" group="XCK"/>
                 <signal pad-id="pf2" function="USART" group="RXD"/>
@@ -426,7 +426,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pc5" function="SPI" group="MOSI" field="SPI"/>
@@ -439,7 +439,7 @@
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
             <signals>
                 <signal pad-id="pd4" function="SPI" group="SS"/>
                 <signal pad-id="pd5" function="SPI" group="MOSI"/>
@@ -448,16 +448,16 @@
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6570_fuse">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6570_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i3610">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1.xml
index 167d2969..fd49951f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1.xml
@@ -63,115 +63,115 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="dma" name="DMA" module-key="i3000">
-            <register-group-instance key="dma" name="DMA" register-group-key="dma" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="dma" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076-revh">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6076-revh">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6076-revh">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i6076-revh">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
         </peripheral>
         <peripheral key="acb" name="ACB" module-key="i6077">
-            <register-group-instance key="acb" name="ACB" register-group-key="ac" address-space-key="data" offset="0x390"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x390"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6064">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="adcb" name="ADCB" module-key="i6064">
-            <register-group-instance key="adcb" name="ADCB" register-group-key="adc" address-space-key="data" offset="0x240"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x240"/>
         </peripheral>
         <peripheral key="daca" name="DACA" module-key="i6059">
-            <register-group-instance key="daca" name="DACA" register-group-key="dac" address-space-key="data" offset="0x300"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x300"/>
         </peripheral>
         <peripheral key="dacb" name="DACB" module-key="i6059">
-            <register-group-instance key="dacb" name="DACB" register-group-key="dac" address-space-key="data" offset="0x320"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x320"/>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="ebi" name="EBI" module-key="i3001">
-            <register-group-instance key="ebi" name="EBI" register-group-key="ebi" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="ebi" address-space-key="data" offset="0x440"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
         </peripheral>
         <peripheral key="twid" name="TWID" module-key="i6089">
-            <register-group-instance key="twid" name="TWID" register-group-key="twi" address-space-key="data" offset="0x490"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x490"/>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
         </peripheral>
         <peripheral key="twif" name="TWIF" module-key="i6089">
-            <register-group-instance key="twif" name="TWIF" register-group-key="twi" address-space-key="data" offset="0x4B0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4B0"/>
         </peripheral>
         <peripheral key="port_cfg" name="PORT_CFG" module-key="gpio_port">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="gpio_port">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="gpio_port">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="gpio_port">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="gpio_port">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -184,7 +184,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -197,7 +197,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -210,7 +210,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -223,7 +223,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -236,7 +236,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -249,7 +249,7 @@
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
-            <register-group-instance key="porth" name="PORTH" register-group-key="port" address-space-key="data" offset="0x6E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6E0"/>
             <signals>
                 <signal pad-id="ph0" index="0" function="PORTH" group="P"/>
                 <signal pad-id="ph1" index="1" function="PORTH" group="P"/>
@@ -262,7 +262,7 @@
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
-            <register-group-instance key="portj" name="PORTJ" register-group-key="port" address-space-key="data" offset="0x700"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x700"/>
             <signals>
                 <signal pad-id="pj0" index="0" function="PORTJ" group="P"/>
                 <signal pad-id="pj1" index="1" function="PORTJ" group="P"/>
@@ -275,7 +275,7 @@
             </signals>
         </peripheral>
         <peripheral key="portk" name="PORTK" module-key="gpio_port">
-            <register-group-instance key="portk" name="PORTK" register-group-key="port" address-space-key="data" offset="0x720"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x720"/>
             <signals>
                 <signal pad-id="pk0" index="0" function="PORTK" group="P"/>
                 <signal pad-id="pk1" index="1" function="PORTK" group="P"/>
@@ -288,7 +288,7 @@
             </signals>
         </peripheral>
         <peripheral key="portq" name="PORTQ" module-key="gpio_port">
-            <register-group-instance key="portq" name="PORTQ" register-group-key="port" address-space-key="data" offset="0x7C0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7C0"/>
             <signals>
                 <signal pad-id="pq0" index="0" function="PORTQ" group="P"/>
                 <signal pad-id="pq1" index="1" function="PORTQ" group="P"/>
@@ -297,95 +297,95 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_tc">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_tc">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
         </peripheral>
         <peripheral key="tcd1" name="TCD1" module-key="i6090_tc">
-            <register-group-instance key="tcd1" name="TCD1" register-group-key="tc1" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x940"/>
         </peripheral>
         <peripheral key="hiresd" name="HIRESD" module-key="i6090_tc">
-            <register-group-instance key="hiresd" name="HIRESD" register-group-key="hires" address-space-key="data" offset="0x990"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x990"/>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
         </peripheral>
         <peripheral key="tce1" name="TCE1" module-key="i6090_tc">
-            <register-group-instance key="tce1" name="TCE1" register-group-key="tc1" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0xA40"/>
         </peripheral>
         <peripheral key="awexe" name="AWEXE" module-key="i6090_tc">
-            <register-group-instance key="awexe" name="AWEXE" register-group-key="awex" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0xA80"/>
         </peripheral>
         <peripheral key="hirese" name="HIRESE" module-key="i6090_tc">
-            <register-group-instance key="hirese" name="HIRESE" register-group-key="hires" address-space-key="data" offset="0xA90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xA90"/>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
-            <register-group-instance key="tcf0" name="TCF0" register-group-key="tc0" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xB00"/>
         </peripheral>
         <peripheral key="tcf1" name="TCF1" module-key="i6090_tc">
-            <register-group-instance key="tcf1" name="TCF1" register-group-key="tc1" address-space-key="data" offset="0xB40"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0xB40"/>
         </peripheral>
         <peripheral key="hiresf" name="HIRESF" module-key="i6090_tc">
-            <register-group-instance key="hiresf" name="HIRESF" register-group-key="hires" address-space-key="data" offset="0xB90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xB90"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
-            <register-group-instance key="usartc1" name="USARTC1" register-group-key="usart" address-space-key="data" offset="0x8B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8B0"/>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
         </peripheral>
         <peripheral key="usartd1" name="USARTD1" module-key="i6090_usart">
-            <register-group-instance key="usartd1" name="USARTD1" register-group-key="usart" address-space-key="data" offset="0x9B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9B0"/>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
         </peripheral>
         <peripheral key="usarte1" name="USARTE1" module-key="i6090_usart">
-            <register-group-instance key="usarte1" name="USARTE1" register-group-key="usart" address-space-key="data" offset="0xAB0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAB0"/>
         </peripheral>
         <peripheral key="usartf0" name="USARTF0" module-key="i6090_usart">
-            <register-group-instance key="usartf0" name="USARTF0" register-group-key="usart" address-space-key="data" offset="0xBA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xBA0"/>
         </peripheral>
         <peripheral key="usartf1" name="USARTF1" module-key="i6090_usart">
-            <register-group-instance key="usartf1" name="USARTF1" register-group-key="usart" address-space-key="data" offset="0xBB0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xBB0"/>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
         </peripheral>
         <peripheral key="spie" name="SPIE" module-key="i6090_spi">
-            <register-group-instance key="spie" name="SPIE" register-group-key="spi" address-space-key="data" offset="0xAC0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0xAC0"/>
         </peripheral>
         <peripheral key="spif" name="SPIF" module-key="i6090_spi">
-            <register-group-instance key="spif" name="SPIF" register-group-key="spi" address-space-key="data" offset="0xBC0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0xBC0"/>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
-            <register-group-instance key="aes" name="AES" register-group-key="aes" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="aes" address-space-key="data" offset="0xC0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1U.xml
index 0f48d740..a67260f1 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1U.xml
@@ -63,58 +63,58 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="i6075_vport">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="i6075_vport">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="i6075_vport">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="i6075_vport">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pc7" function="CLKOUTC" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pc4" function="CLKOUTC_ALT" group="CLKOUT" field="CLKEVPIN"/>
@@ -132,22 +132,22 @@
             </signals>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
-            <register-group-instance key="aes" name="AES" register-group-key="aes" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="aes" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="dma" name="DMA" module-key="i3000">
-            <register-group-instance key="dma" name="DMA" register-group-key="dma" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="dma" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6099">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADCPOS" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADCPOS" group="ADC"/>
@@ -186,7 +186,7 @@
             </signals>
         </peripheral>
         <peripheral key="adcb" name="ADCB" module-key="i6099">
-            <register-group-instance key="adcb" name="ADCB" register-group-key="adc" address-space-key="data" offset="0x240"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x240"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="ADCPOS" group="ADC"/>
                 <signal pad-id="pb1" index="1" function="ADCPOS" group="ADC"/>
@@ -217,7 +217,7 @@
             </signals>
         </peripheral>
         <peripheral key="daca" name="DACA" module-key="i6059">
-            <register-group-instance key="daca" name="DACA" register-group-key="dac" address-space-key="data" offset="0x300"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x300"/>
             <signals>
                 <signal pad-id="pa2" index="0" function="DAC" group="DAC"/>
                 <signal pad-id="pa3" index="1" function="DAC" group="DAC"/>
@@ -226,7 +226,7 @@
             </signals>
         </peripheral>
         <peripheral key="dacb" name="DACB" module-key="i6059">
-            <register-group-instance key="dacb" name="DACB" register-group-key="dac" address-space-key="data" offset="0x320"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x320"/>
             <signals>
                 <signal pad-id="pb2" index="0" function="DAC" group="DAC"/>
                 <signal pad-id="pb3" index="1" function="DAC" group="DAC"/>
@@ -235,7 +235,7 @@
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ACPOS" group="AC"/>
                 <signal pad-id="pa1" index="1" function="ACPOS" group="AC"/>
@@ -254,7 +254,7 @@
             </signals>
         </peripheral>
         <peripheral key="acb" name="ACB" module-key="i6077">
-            <register-group-instance key="acb" name="ACB" register-group-key="ac" address-space-key="data" offset="0x390"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x390"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="ACPOS" group="AC"/>
                 <signal pad-id="pb1" index="1" function="ACPOS" group="AC"/>
@@ -273,10 +273,10 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="ebi" name="EBI" module-key="i3001">
-            <register-group-instance key="ebi" name="EBI" register-group-key="ebi" address-space-key="data" offset="0x440"/>
+            <register-group-instance register-group-key="ebi" address-space-key="data" offset="0x440"/>
             <signals>
                 <signal pad-id="ph0" index="0" function="EBIPORT0" group="PORT0"/>
                 <signal pad-id="ph1" index="1" function="EBIPORT0" group="PORT0"/>
@@ -313,42 +313,42 @@
             </signals>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWIC" group="SDA"/>
                 <signal pad-id="pc1" function="TWIC" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twid" name="TWID" module-key="i6089">
-            <register-group-instance key="twid" name="TWID" register-group-key="twi" address-space-key="data" offset="0x490"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x490"/>
             <signals>
                 <signal pad-id="pd0" function="TWID" group="SDA"/>
                 <signal pad-id="pd1" function="TWID" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pe0" function="TWIE" group="SDA"/>
                 <signal pad-id="pe1" function="TWIE" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twif" name="TWIF" module-key="i6089">
-            <register-group-instance key="twif" name="TWIF" register-group-key="twi" address-space-key="data" offset="0x4B0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4B0"/>
             <signals>
                 <signal pad-id="pf0" function="TWIF" group="SDA"/>
                 <signal pad-id="pf1" function="TWIF" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
-            <register-group-instance key="usb" name="USB" register-group-key="usb" address-space-key="data" offset="0x4C0"/>
+            <register-group-instance register-group-key="usb" address-space-key="data" offset="0x4C0"/>
             <signals>
                 <signal pad-id="pd6" function="USB" group="DN"/>
                 <signal pad-id="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -361,7 +361,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -374,7 +374,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -387,7 +387,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -400,7 +400,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -413,7 +413,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -426,7 +426,7 @@
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
-            <register-group-instance key="porth" name="PORTH" register-group-key="port" address-space-key="data" offset="0x6E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6E0"/>
             <signals>
                 <signal pad-id="ph0" index="0" function="PORTH" group="P"/>
                 <signal pad-id="ph1" index="1" function="PORTH" group="P"/>
@@ -439,7 +439,7 @@
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
-            <register-group-instance key="portj" name="PORTJ" register-group-key="port" address-space-key="data" offset="0x700"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x700"/>
             <signals>
                 <signal pad-id="pj0" index="0" function="PORTJ" group="P"/>
                 <signal pad-id="pj1" index="1" function="PORTJ" group="P"/>
@@ -452,7 +452,7 @@
             </signals>
         </peripheral>
         <peripheral key="portk" name="PORTK" module-key="gpio_port">
-            <register-group-instance key="portk" name="PORTK" register-group-key="port" address-space-key="data" offset="0x720"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x720"/>
             <signals>
                 <signal pad-id="pk0" index="0" function="PORTK" group="P"/>
                 <signal pad-id="pk1" index="1" function="PORTK" group="P"/>
@@ -465,7 +465,7 @@
             </signals>
         </peripheral>
         <peripheral key="portq" name="PORTQ" module-key="gpio_port">
-            <register-group-instance key="portq" name="PORTQ" register-group-key="port" address-space-key="data" offset="0x7C0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7C0"/>
             <signals>
                 <signal pad-id="pq0" index="0" function="PORTQ" group="P"/>
                 <signal pad-id="pq1" index="1" function="PORTQ" group="P"/>
@@ -474,14 +474,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TCC" group="OC0A"/>
                 <signal pad-id="pc1" function="TCC" group="OC0B"/>
@@ -494,14 +494,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TCC" group="OC1A"/>
                 <signal pad-id="pc5" function="TCC" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TCD" group="OC0A"/>
                 <signal pad-id="pd1" function="TCD" group="OC0B"/>
@@ -510,14 +510,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcd1" name="TCD1" module-key="i6090_tc">
-            <register-group-instance key="tcd1" name="TCD1" register-group-key="tc1" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pd4" function="TCD" group="OC1A"/>
                 <signal pad-id="pd5" function="TCD" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TCE0" group="OC0A"/>
                 <signal pad-id="pe1" function="TCE0" group="OC0B"/>
@@ -526,14 +526,14 @@
             </signals>
         </peripheral>
         <peripheral key="tce1" name="TCE1" module-key="i6090_tc">
-            <register-group-instance key="tce1" name="TCE1" register-group-key="tc1" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pe4" function="TCE1" group="OC1A"/>
                 <signal pad-id="pe5" function="TCE1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
-            <register-group-instance key="tcf0" name="TCF0" register-group-key="tc0" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TCF0" group="OC0A"/>
                 <signal pad-id="pf1" function="TCF0" group="OC0B"/>
@@ -542,14 +542,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcf1" name="TCF1" module-key="i6090_tc">
-            <register-group-instance key="tcf1" name="TCF1" register-group-key="tc1" address-space-key="data" offset="0xB40"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0xB40"/>
             <signals>
                 <signal pad-id="pf4" function="TCF1" group="OC1A"/>
                 <signal pad-id="pf5" function="TCF1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
-            <register-group-instance key="tcc2" name="TCC2" register-group-key="tc2" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TCC2" group="LOC2A"/>
                 <signal pad-id="pc1" function="TCC2" group="LOC2B"/>
@@ -562,7 +562,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
-            <register-group-instance key="tcd2" name="TCD2" register-group-key="tc2" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TCD2" group="LOC2A"/>
                 <signal pad-id="pd1" function="TCD2" group="LOC2B"/>
@@ -575,7 +575,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
-            <register-group-instance key="tce2" name="TCE2" register-group-key="tc2" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TCE2" group="LOC2A"/>
                 <signal pad-id="pe1" function="TCE2" group="LOC2B"/>
@@ -588,7 +588,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
-            <register-group-instance key="tcf2" name="TCF2" register-group-key="tc2" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TCF2" group="LOC2A"/>
                 <signal pad-id="pf1" function="TCF2" group="LOC2B"/>
@@ -601,7 +601,7 @@
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pc0" function="AWEXC" group="OC0ALS"/>
                 <signal pad-id="pc1" function="AWEXC" group="OC0AHS"/>
@@ -614,7 +614,7 @@
             </signals>
         </peripheral>
         <peripheral key="awexe" name="AWEXE" module-key="i6090_awex">
-            <register-group-instance key="awexe" name="AWEXE" register-group-key="awex" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0xA80"/>
             <signals>
                 <signal pad-id="pe0" function="AWEXE" group="OC0ALS"/>
                 <signal pad-id="pe1" function="AWEXE" group="OC0AHS"/>
@@ -627,19 +627,19 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="hiresd" name="HIRESD" module-key="i6090_hires">
-            <register-group-instance key="hiresd" name="HIRESD" register-group-key="hires" address-space-key="data" offset="0x990"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x990"/>
         </peripheral>
         <peripheral key="hirese" name="HIRESE" module-key="i6090_hires">
-            <register-group-instance key="hirese" name="HIRESE" register-group-key="hires" address-space-key="data" offset="0xA90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xA90"/>
         </peripheral>
         <peripheral key="hiresf" name="HIRESF" module-key="i6090_hires">
-            <register-group-instance key="hiresf" name="HIRESF" register-group-key="hires" address-space-key="data" offset="0xB90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xB90"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK"/>
                 <signal pad-id="pc2" function="USART" group="RXD"/>
@@ -650,7 +650,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
-            <register-group-instance key="usartc1" name="USARTC1" register-group-key="usart" address-space-key="data" offset="0x8B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8B0"/>
             <signals>
                 <signal pad-id="pc5" function="USART" group="XCK"/>
                 <signal pad-id="pc6" function="USART" group="RXD"/>
@@ -658,7 +658,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
             <signals>
                 <signal pad-id="pd1" function="USART" group="XCK"/>
                 <signal pad-id="pd2" function="USART" group="RXD"/>
@@ -666,7 +666,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd1" name="USARTD1" module-key="i6090_usart">
-            <register-group-instance key="usartd1" name="USARTD1" register-group-key="usart" address-space-key="data" offset="0x9B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9B0"/>
             <signals>
                 <signal pad-id="pd5" function="USART" group="XCK"/>
                 <signal pad-id="pd6" function="USART" group="RXD"/>
@@ -674,7 +674,7 @@
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
             <signals>
                 <signal pad-id="pe1" function="USART" group="XCK"/>
                 <signal pad-id="pe2" function="USART" group="RXD"/>
@@ -682,7 +682,7 @@
             </signals>
         </peripheral>
         <peripheral key="usarte1" name="USARTE1" module-key="i6090_usart">
-            <register-group-instance key="usarte1" name="USARTE1" register-group-key="usart" address-space-key="data" offset="0xAB0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAB0"/>
             <signals>
                 <signal pad-id="pe5" function="USART" group="XCK"/>
                 <signal pad-id="pe6" function="USART" group="RXD"/>
@@ -690,7 +690,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartf0" name="USARTF0" module-key="i6090_usart">
-            <register-group-instance key="usartf0" name="USARTF0" register-group-key="usart" address-space-key="data" offset="0xBA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xBA0"/>
             <signals>
                 <signal pad-id="pf1" function="USARTF0" group="XCK"/>
                 <signal pad-id="pf2" function="USARTF0" group="RXD"/>
@@ -698,7 +698,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartf1" name="USARTF1" module-key="i6090_usart">
-            <register-group-instance key="usartf1" name="USARTF1" register-group-key="usart" address-space-key="data" offset="0xBB0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xBB0"/>
             <signals>
                 <signal pad-id="pf5" function="USARTF1" group="XCK"/>
                 <signal pad-id="pf6" function="USARTF1" group="RXD"/>
@@ -706,7 +706,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc4" function="SPIC" group="SS"/>
                 <signal pad-id="pc5" function="SPIC" group="MOSI"/>
@@ -715,7 +715,7 @@
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
             <signals>
                 <signal pad-id="pd4" function="SPID" group="SS"/>
                 <signal pad-id="pd5" function="SPID" group="MOSI"/>
@@ -724,7 +724,7 @@
             </signals>
         </peripheral>
         <peripheral key="spie" name="SPIE" module-key="i6090_spi">
-            <register-group-instance key="spie" name="SPIE" register-group-key="spi" address-space-key="data" offset="0xAC0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0xAC0"/>
             <signals>
                 <signal pad-id="pe4" function="SPIE" group="SS"/>
                 <signal pad-id="pe5" function="SPIE" group="MOSI"/>
@@ -733,7 +733,7 @@
             </signals>
         </peripheral>
         <peripheral key="spif" name="SPIF" module-key="i6090_spi">
-            <register-group-instance key="spif" name="SPIF" register-group-key="spi" address-space-key="data" offset="0xBC0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0xBC0"/>
             <signals>
                 <signal pad-id="pf4" function="SPIF" group="SS"/>
                 <signal pad-id="pf5" function="SPIF" group="MOSI"/>
@@ -742,16 +742,16 @@
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6570_fuse">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6570_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i6570_sigrow">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3.xml
index 749162af..ee44c649 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3.xml
@@ -62,103 +62,103 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="dma" name="DMA" module-key="i3000">
-            <register-group-instance key="dma" name="DMA" register-group-key="dma" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="dma" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6076">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6076">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i6076">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
         </peripheral>
         <peripheral key="acb" name="ACB" module-key="i6077">
-            <register-group-instance key="acb" name="ACB" register-group-key="ac" address-space-key="data" offset="0x390"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x390"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6064">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
         </peripheral>
         <peripheral key="adcb" name="ADCB" module-key="i6064">
-            <register-group-instance key="adcb" name="ADCB" register-group-key="adc" address-space-key="data" offset="0x240"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x240"/>
         </peripheral>
         <peripheral key="dacb" name="DACB" module-key="i6059">
-            <register-group-instance key="dacb" name="DACB" register-group-key="dac" address-space-key="data" offset="0x320"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x320"/>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
         </peripheral>
         <peripheral key="port_cfg" name="PORT_CFG" module-key="gpio_port">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="gpio_port">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="gpio_port">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="gpio_port">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="gpio_port">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -171,7 +171,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -184,7 +184,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -197,7 +197,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -210,7 +210,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -223,7 +223,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -236,92 +236,92 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_tc">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_tc">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
         </peripheral>
         <peripheral key="tcd1" name="TCD1" module-key="i6090_tc">
-            <register-group-instance key="tcd1" name="TCD1" register-group-key="tc1" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x940"/>
         </peripheral>
         <peripheral key="hiresd" name="HIRESD" module-key="i6090_tc">
-            <register-group-instance key="hiresd" name="HIRESD" register-group-key="hires" address-space-key="data" offset="0x990"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x990"/>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
         </peripheral>
         <peripheral key="tce1" name="TCE1" module-key="i6090_tc">
-            <register-group-instance key="tce1" name="TCE1" register-group-key="tc1" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0xA40"/>
         </peripheral>
         <peripheral key="awexe" name="AWEXE" module-key="i6090_tc">
-            <register-group-instance key="awexe" name="AWEXE" register-group-key="awex" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0xA80"/>
         </peripheral>
         <peripheral key="hirese" name="HIRESE" module-key="i6090_tc">
-            <register-group-instance key="hirese" name="HIRESE" register-group-key="hires" address-space-key="data" offset="0xA90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xA90"/>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
-            <register-group-instance key="tcf0" name="TCF0" register-group-key="tc0" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xB00"/>
         </peripheral>
         <peripheral key="hiresf" name="HIRESF" module-key="i6090_tc">
-            <register-group-instance key="hiresf" name="HIRESF" register-group-key="hires" address-space-key="data" offset="0xB90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xB90"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
-            <register-group-instance key="usartc1" name="USARTC1" register-group-key="usart" address-space-key="data" offset="0x8B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8B0"/>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
         </peripheral>
         <peripheral key="usartd1" name="USARTD1" module-key="i6090_usart">
-            <register-group-instance key="usartd1" name="USARTD1" register-group-key="usart" address-space-key="data" offset="0x9B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9B0"/>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
         </peripheral>
         <peripheral key="usarte1" name="USARTE1" module-key="i6090_usart">
-            <register-group-instance key="usarte1" name="USARTE1" register-group-key="usart" address-space-key="data" offset="0xAB0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAB0"/>
         </peripheral>
         <peripheral key="usartf0" name="USARTF0" module-key="i6090_usart">
-            <register-group-instance key="usartf0" name="USARTF0" register-group-key="usart" address-space-key="data" offset="0xBA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xBA0"/>
         </peripheral>
         <peripheral key="usartf1" name="USARTF1" module-key="i6090_usart">
-            <register-group-instance key="usartf1" name="USARTF1" register-group-key="usart" address-space-key="data" offset="0xBB0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xBB0"/>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
         </peripheral>
         <peripheral key="spie" name="SPIE" module-key="i6090_spi">
-            <register-group-instance key="spie" name="SPIE" register-group-key="spi" address-space-key="data" offset="0xAC0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0xAC0"/>
         </peripheral>
         <peripheral key="spif" name="SPIF" module-key="i6090_spi">
-            <register-group-instance key="spif" name="SPIF" register-group-key="spi" address-space-key="data" offset="0xBC0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0xBC0"/>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
-            <register-group-instance key="aes" name="AES" register-group-key="aes" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="aes" address-space-key="data" offset="0xC0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3U.xml
index 4509f04d..dcf24beb 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3U.xml
@@ -62,37 +62,37 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="i6075_vport">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="i6075_vport">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="i6075_vport">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="i6075_vport">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
             <signals>
                 <signal pad-id="pr0" function="XTAL" group="XTAL2"/>
                 <signal pad-id="pr1" function="XTAL" group="XTAL1"/>
@@ -101,25 +101,25 @@
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pc7" function="CLKOUTC" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pc4" function="CLKOUTC_ALT" group="CLKOUT" field="CLKEVPIN"/>
@@ -137,22 +137,22 @@
             </signals>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
-            <register-group-instance key="aes" name="AES" register-group-key="aes" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="aes" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="dma" name="DMA" module-key="i3000">
-            <register-group-instance key="dma" name="DMA" register-group-key="dma" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="dma" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6099">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -175,7 +175,7 @@
             </signals>
         </peripheral>
         <peripheral key="adcb" name="ADCB" module-key="i6099">
-            <register-group-instance key="adcb" name="ADCB" register-group-key="adc" address-space-key="data" offset="0x240"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x240"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pb1" index="1" function="ADC" group="ADC"/>
@@ -190,7 +190,7 @@
             </signals>
         </peripheral>
         <peripheral key="dacb" name="DACB" module-key="i6059">
-            <register-group-instance key="dacb" name="DACB" register-group-key="dac" address-space-key="data" offset="0x320"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x320"/>
             <signals>
                 <signal pad-id="pb2" index="0" function="DAC" group="DAC"/>
                 <signal pad-id="pb3" index="1" function="DAC" group="DAC"/>
@@ -199,7 +199,7 @@
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pa1" index="1" function="AC" group="AC"/>
@@ -214,7 +214,7 @@
             </signals>
         </peripheral>
         <peripheral key="acb" name="ACB" module-key="i6077">
-            <register-group-instance key="acb" name="ACB" register-group-key="ac" address-space-key="data" offset="0x390"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x390"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pb1" index="1" function="AC" group="AC"/>
@@ -229,10 +229,10 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWI" group="SDA"/>
                 <signal pad-id="pc1" function="TWI" group="SCL"/>
@@ -243,7 +243,7 @@
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pe0" function="TWI" group="SDA"/>
                 <signal pad-id="pe1" function="TWI" group="SCL"/>
@@ -254,14 +254,14 @@
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
-            <register-group-instance key="usb" name="USB" register-group-key="usb" address-space-key="data" offset="0x4C0"/>
+            <register-group-instance register-group-key="usb" address-space-key="data" offset="0x4C0"/>
             <signals>
                 <signal pad-id="pd6" function="USB" group="DN"/>
                 <signal pad-id="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -274,7 +274,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -287,7 +287,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -300,7 +300,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -313,7 +313,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -326,7 +326,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -339,14 +339,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pc1" function="TC0" group="OC0B" field="TC0B"/>
@@ -359,14 +359,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TC1" group="OC1A"/>
                 <signal pad-id="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pd1" function="TC0" group="OC0B" field="TC0B"/>
@@ -379,14 +379,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcd1" name="TCD1" module-key="i6090_tc">
-            <register-group-instance key="tcd1" name="TCD1" register-group-key="tc1" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pd4" function="TC1" group="OC1A"/>
                 <signal pad-id="pd5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pe1" function="TC0" group="OC0B" field="TC0B"/>
@@ -399,14 +399,14 @@
             </signals>
         </peripheral>
         <peripheral key="tce1" name="TCE1" module-key="i6090_tc">
-            <register-group-instance key="tce1" name="TCE1" register-group-key="tc1" address-space-key="data" offset="0xA40"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0xA40"/>
             <signals>
                 <signal pad-id="pe4" function="TC1" group="OC1A"/>
                 <signal pad-id="pe5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
-            <register-group-instance key="tcf0" name="TCF0" register-group-key="tc0" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TC0" group="OC0A"/>
                 <signal pad-id="pf1" function="TC0" group="OC0B"/>
@@ -415,7 +415,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
-            <register-group-instance key="tcc2" name="TCC2" register-group-key="tc2" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pc1" function="TC2" group="LOC2B"/>
@@ -428,7 +428,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
-            <register-group-instance key="tcd2" name="TCD2" register-group-key="tc2" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pd1" function="TC2" group="LOC2B"/>
@@ -441,7 +441,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
-            <register-group-instance key="tce2" name="TCE2" register-group-key="tc2" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pe1" function="TC2" group="LOC2B"/>
@@ -454,7 +454,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
-            <register-group-instance key="tcf2" name="TCF2" register-group-key="tc2" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pf1" function="TC2" group="LOC2B"/>
@@ -467,7 +467,7 @@
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pc0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pc1" function="AWEX" group="OC0AHS"/>
@@ -480,7 +480,7 @@
             </signals>
         </peripheral>
         <peripheral key="awexe" name="AWEXE" module-key="i6090_awex">
-            <register-group-instance key="awexe" name="AWEXE" register-group-key="awex" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0xA80"/>
             <signals>
                 <signal pad-id="pe0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pe1" function="AWEX" group="OC0AHS"/>
@@ -493,19 +493,19 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="hiresd" name="HIRESD" module-key="i6090_hires">
-            <register-group-instance key="hiresd" name="HIRESD" register-group-key="hires" address-space-key="data" offset="0x990"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x990"/>
         </peripheral>
         <peripheral key="hirese" name="HIRESE" module-key="i6090_hires">
-            <register-group-instance key="hirese" name="HIRESE" register-group-key="hires" address-space-key="data" offset="0xA90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xA90"/>
         </peripheral>
         <peripheral key="hiresf" name="HIRESF" module-key="i6090_hires">
-            <register-group-instance key="hiresf" name="HIRESF" register-group-key="hires" address-space-key="data" offset="0xB90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xB90"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pc2" function="USART" group="RXD" field="USART0"/>
@@ -516,7 +516,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
-            <register-group-instance key="usartc1" name="USARTC1" register-group-key="usart" address-space-key="data" offset="0x8B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8B0"/>
             <signals>
                 <signal pad-id="pd5" function="USART" group="XCK"/>
                 <signal pad-id="pd6" function="USART" group="RXD"/>
@@ -524,7 +524,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
             <signals>
                 <signal pad-id="pd1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pd2" function="USART" group="RXD" field="USART0"/>
@@ -535,7 +535,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd1" name="USARTD1" module-key="i6090_usart">
-            <register-group-instance key="usartd1" name="USARTD1" register-group-key="usart" address-space-key="data" offset="0x9B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9B0"/>
             <signals>
                 <signal pad-id="pd5" function="USART" group="XCK"/>
                 <signal pad-id="pd6" function="USART" group="RXD"/>
@@ -543,7 +543,7 @@
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
             <signals>
                 <signal pad-id="pe1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pe2" function="USART" group="RXD" field="USART0"/>
@@ -554,7 +554,7 @@
             </signals>
         </peripheral>
         <peripheral key="usarte1" name="USARTE1" module-key="i6090_usart">
-            <register-group-instance key="usarte1" name="USARTE1" register-group-key="usart" address-space-key="data" offset="0xAB0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAB0"/>
             <signals>
                 <signal pad-id="pe5" function="USART" group="XCK"/>
                 <signal pad-id="pe6" function="USART" group="RXD"/>
@@ -562,7 +562,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartf0" name="USARTF0" module-key="i6090_usart">
-            <register-group-instance key="usartf0" name="USARTF0" register-group-key="usart" address-space-key="data" offset="0xBA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xBA0"/>
             <signals>
                 <signal pad-id="pf1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pf2" function="USART" group="RXD" field="USART0"/>
@@ -573,7 +573,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pc5" function="SPI" group="MOSI" field="SPI"/>
@@ -586,7 +586,7 @@
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
             <signals>
                 <signal pad-id="pd4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pd5" function="SPI" group="MOSI" field="SPI"/>
@@ -599,7 +599,7 @@
             </signals>
         </peripheral>
         <peripheral key="spie" name="SPIE" module-key="i6090_spi">
-            <register-group-instance key="spie" name="SPIE" register-group-key="spi" address-space-key="data" offset="0xAC0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0xAC0"/>
             <signals>
                 <signal pad-id="pe4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pe5" function="SPI" group="MOSI" field="SPI"/>
@@ -612,16 +612,16 @@
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6570_fuse">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6570_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i6570_sigrow">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A4U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A4U.xml
index e19de944..10ec35d1 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A4U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A4U.xml
@@ -60,37 +60,37 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="i6075_vport">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="i6075_vport">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="i6075_vport">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="i6075_vport">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
             <signals>
                 <signal pad-id="pr0" function="XTAL" group="XTAL2"/>
                 <signal pad-id="pr1" function="XTAL" group="XTAL1"/>
@@ -101,25 +101,25 @@
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pc7" function="CLKOUTC" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pc4" function="CLKOUTC_ALT" group="CLKOUT" field="CLKEVPIN"/>
@@ -133,22 +133,22 @@
             </signals>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
-            <register-group-instance key="aes" name="AES" register-group-key="aes" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="aes" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="dma" name="DMA" module-key="i3000">
-            <register-group-instance key="dma" name="DMA" register-group-key="dma" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="dma" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6099">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -167,7 +167,7 @@
             </signals>
         </peripheral>
         <peripheral key="dacb" name="DACB" module-key="i6059">
-            <register-group-instance key="dacb" name="DACB" register-group-key="dac" address-space-key="data" offset="0x320"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x320"/>
             <signals>
                 <signal pad-id="pb2" index="0" function="DAC" group="DAC"/>
                 <signal pad-id="pb3" index="1" function="DAC" group="DAC"/>
@@ -176,7 +176,7 @@
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pa1" index="1" function="AC" group="AC"/>
@@ -191,10 +191,10 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWI" group="SDA"/>
                 <signal pad-id="pc1" function="TWI" group="SCL"/>
@@ -205,21 +205,21 @@
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pe0" function="TWI" group="SDA"/>
                 <signal pad-id="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
-            <register-group-instance key="usb" name="USB" register-group-key="usb" address-space-key="data" offset="0x4C0"/>
+            <register-group-instance register-group-key="usb" address-space-key="data" offset="0x4C0"/>
             <signals>
                 <signal pad-id="pd6" function="USB" group="DN"/>
                 <signal pad-id="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -232,7 +232,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -241,7 +241,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -254,7 +254,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -267,7 +267,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -276,14 +276,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pc1" function="TC0" group="OC0B" field="TC0B"/>
@@ -296,14 +296,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TC1" group="OC1A"/>
                 <signal pad-id="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC0" group="OC0A"/>
                 <signal pad-id="pd1" function="TC0" group="OC0B"/>
@@ -316,14 +316,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcd1" name="TCD1" module-key="i6090_tc">
-            <register-group-instance key="tcd1" name="TCD1" register-group-key="tc1" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pd4" function="TC1" group="OC1A"/>
                 <signal pad-id="pd5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC0" group="OC0A"/>
                 <signal pad-id="pe1" function="TC0" group="OC0B"/>
@@ -332,7 +332,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
-            <register-group-instance key="tcc2" name="TCC2" register-group-key="tc2" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pc1" function="TC2" group="LOC2B"/>
@@ -345,7 +345,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
-            <register-group-instance key="tcd2" name="TCD2" register-group-key="tc2" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pd1" function="TC2" group="LOC2B"/>
@@ -358,7 +358,7 @@
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pc0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pc1" function="AWEX" group="OC0AHS"/>
@@ -371,16 +371,16 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="hiresd" name="HIRESD" module-key="i6090_hires">
-            <register-group-instance key="hiresd" name="HIRESD" register-group-key="hires" address-space-key="data" offset="0x990"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x990"/>
         </peripheral>
         <peripheral key="hirese" name="HIRESE" module-key="i6090_hires">
-            <register-group-instance key="hirese" name="HIRESE" register-group-key="hires" address-space-key="data" offset="0xA90"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0xA90"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pc2" function="USART" group="RXD" field="USART0"/>
@@ -391,7 +391,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
-            <register-group-instance key="usartc1" name="USARTC1" register-group-key="usart" address-space-key="data" offset="0x8B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8B0"/>
             <signals>
                 <signal pad-id="pd5" function="USART" group="XCK"/>
                 <signal pad-id="pd6" function="USART" group="RXD"/>
@@ -399,7 +399,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
             <signals>
                 <signal pad-id="pd1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pd2" function="USART" group="RXD" field="USART0"/>
@@ -410,7 +410,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd1" name="USARTD1" module-key="i6090_usart">
-            <register-group-instance key="usartd1" name="USARTD1" register-group-key="usart" address-space-key="data" offset="0x9B0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9B0"/>
             <signals>
                 <signal pad-id="pd5" function="USART" group="XCK"/>
                 <signal pad-id="pd6" function="USART" group="RXD"/>
@@ -418,7 +418,7 @@
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
             <signals>
                 <signal pad-id="pe1" function="USART" group="XCK"/>
                 <signal pad-id="pe2" function="USART" group="RXD"/>
@@ -426,7 +426,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pc5" function="SPI" group="MOSI" field="SPI"/>
@@ -439,7 +439,7 @@
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
             <signals>
                 <signal pad-id="pd4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pd5" function="SPI" group="MOSI" field="SPI"/>
@@ -452,16 +452,16 @@
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6570_fuse">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6570_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i6570_sigrow">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64B1.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64B1.xml
index 580cf98a..29b07623 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64B1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64B1.xml
@@ -62,28 +62,28 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="i6075_vport">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="i6075_vport">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="i6075_vport">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="i6075_vport">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="EXTERNAL_CLOCK" group="EXTCLK"/>
                 <signal pad-id="pc1" index="1" function="EXTERNAL_CLOCK" group="EXTCLK"/>
@@ -96,10 +96,10 @@
             </signals>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
             <signals>
                 <signal pad-id="pr0" function="XTAL" group="XTAL2"/>
                 <signal pad-id="pr1" function="XTAL" group="XTAL1"/>
@@ -110,28 +110,28 @@
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6080">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pd7" function="CLKOUTC" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pd7" function="EVOUTC" group="EVOUT" field="EVOUT"/>
@@ -141,22 +141,22 @@
             </signals>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
-            <register-group-instance key="aes" name="AES" register-group-key="aes" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="aes" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="dma" name="DMA" module-key="i3000">
-            <register-group-instance key="dma" name="DMA" register-group-key="dma" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="dma" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6110">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -179,7 +179,7 @@
             </signals>
         </peripheral>
         <peripheral key="adcb" name="ADCB" module-key="i6110">
-            <register-group-instance key="adcb" name="ADCB" register-group-key="adc" address-space-key="data" offset="0x240"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x240"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pb1" index="1" function="ADC" group="ADC"/>
@@ -194,7 +194,7 @@
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pa1" index="1" function="AC" group="AC"/>
@@ -209,7 +209,7 @@
             </signals>
         </peripheral>
         <peripheral key="acb" name="ACB" module-key="i6077">
-            <register-group-instance key="acb" name="ACB" register-group-key="ac" address-space-key="data" offset="0x390"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x390"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pb1" index="1" function="AC" group="AC"/>
@@ -224,24 +224,24 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWI" group="SDA"/>
                 <signal pad-id="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
-            <register-group-instance key="usb" name="USB" register-group-key="usb" address-space-key="data" offset="0x4C0"/>
+            <register-group-instance register-group-key="usb" address-space-key="data" offset="0x4C0"/>
             <signals>
                 <signal pad-id="pd0" function="USB" group="DN"/>
                 <signal pad-id="pd1" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -254,7 +254,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -267,7 +267,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -280,7 +280,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -288,7 +288,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -301,7 +301,7 @@
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" register-group-key="port" address-space-key="data" offset="0x6C0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6C0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="PORTG" group="P"/>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
@@ -314,7 +314,7 @@
             </signals>
         </peripheral>
         <peripheral key="portm" name="PORTM" module-key="gpio_port">
-            <register-group-instance key="portm" name="PORTM" register-group-key="port" address-space-key="data" offset="0x760"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x760"/>
             <signals>
                 <signal pad-id="pm0" index="0" function="PORTM" group="P"/>
                 <signal pad-id="pm1" index="1" function="PORTM" group="P"/>
@@ -327,14 +327,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pc1" function="TC0" group="OC0B" field="TC0B"/>
@@ -347,14 +347,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TC1" group="OC1A"/>
                 <signal pad-id="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pe1" function="TC0" group="OC0B" field="TC0B"/>
@@ -367,7 +367,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
-            <register-group-instance key="tcc2" name="TCC2" register-group-key="tc2" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pc1" function="TC2" group="LOC2B"/>
@@ -380,7 +380,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
-            <register-group-instance key="tce2" name="TCE2" register-group-key="tc2" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pe1" function="TC2" group="LOC2B"/>
@@ -393,7 +393,7 @@
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pc0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pc1" function="AWEX" group="OC0AHS"/>
@@ -406,10 +406,10 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pc2" function="USART" group="RXD" field="USART0"/>
@@ -420,7 +420,7 @@
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
             <signals>
                 <signal pad-id="pe1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pe2" function="USART" group="RXD" field="USART0"/>
@@ -431,7 +431,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pc5" function="SPI" group="MOSI" field="SPI"/>
@@ -444,10 +444,10 @@
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="lcd" name="LCD" module-key="i3003">
-            <register-group-instance key="lcd" name="LCD" register-group-key="lcd" address-space-key="data" offset="0xD00"/>
+            <register-group-instance register-group-key="lcd" address-space-key="data" offset="0xD00"/>
             <signals>
                 <signal pad-id="pg0" index="39" function="LCD_SEG" group="SEG"/>
                 <signal pad-id="pg1" index="38" function="LCD_SEG" group="SEG"/>
@@ -510,10 +510,10 @@
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6570_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i3600">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64B3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64B3.xml
index bd2dc916..332f094e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64B3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64B3.xml
@@ -62,28 +62,28 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="i6075_vport">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="i6075_vport">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="i6075_vport">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="i6075_vport">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="EXTERNAL_CLOCK" group="EXTCLK"/>
                 <signal pad-id="pc1" index="1" function="EXTERNAL_CLOCK" group="EXTCLK"/>
@@ -96,10 +96,10 @@
             </signals>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
             <signals>
                 <signal pad-id="pr0" function="XTAL" group="XTAL2"/>
                 <signal pad-id="pr1" function="XTAL" group="XTAL1"/>
@@ -108,28 +108,28 @@
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6080">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pd7" function="CLKOUTC" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pd7" function="EVOUTC" group="EVOUT" field="EVOUT"/>
@@ -137,22 +137,22 @@
             </signals>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
-            <register-group-instance key="aes" name="AES" register-group-key="aes" address-space-key="data" offset="0xC0"/>
+            <register-group-instance register-group-key="aes" address-space-key="data" offset="0xC0"/>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="dma" name="DMA" module-key="i3000">
-            <register-group-instance key="dma" name="DMA" register-group-key="dma" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="dma" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="adcb" name="ADCB" module-key="i6110">
-            <register-group-instance key="adcb" name="ADCB" register-group-key="adc" address-space-key="data" offset="0x240"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x240"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pb1" index="1" function="ADC" group="ADC"/>
@@ -166,7 +166,7 @@
             </signals>
         </peripheral>
         <peripheral key="acb" name="ACB" module-key="i6077">
-            <register-group-instance key="acb" name="ACB" register-group-key="ac" address-space-key="data" offset="0x390"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x390"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pb1" index="1" function="AC" group="AC"/>
@@ -181,24 +181,24 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWI" group="SDA"/>
                 <signal pad-id="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
-            <register-group-instance key="usb" name="USB" register-group-key="usb" address-space-key="data" offset="0x4C0"/>
+            <register-group-instance register-group-key="usb" address-space-key="data" offset="0x4C0"/>
             <signals>
                 <signal pad-id="pd0" function="USB" group="DN"/>
                 <signal pad-id="pd1" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -211,7 +211,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -224,14 +224,14 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
-            <register-group-instance key="portg" name="PORTG" register-group-key="port" address-space-key="data" offset="0x6C0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6C0"/>
             <signals>
                 <signal pad-id="pg0" index="0" function="PORTG" group="P"/>
                 <signal pad-id="pg1" index="1" function="PORTG" group="P"/>
@@ -244,7 +244,7 @@
             </signals>
         </peripheral>
         <peripheral key="portm" name="PORTM" module-key="gpio_port">
-            <register-group-instance key="portm" name="PORTM" register-group-key="port" address-space-key="data" offset="0x760"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x760"/>
             <signals>
                 <signal pad-id="pm0" index="0" function="PORTM" group="P"/>
                 <signal pad-id="pm1" index="1" function="PORTM" group="P"/>
@@ -257,14 +257,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pc1" function="TC0" group="OC0B" field="TC0B"/>
@@ -277,14 +277,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TC1" group="OC1A"/>
                 <signal pad-id="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
-            <register-group-instance key="tcc2" name="TCC2" register-group-key="tc2" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pc1" function="TC2" group="LOC2B"/>
@@ -297,7 +297,7 @@
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pc0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pc1" function="AWEX" group="OC0AHS"/>
@@ -310,10 +310,10 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pc2" function="USART" group="RXD" field="USART0"/>
@@ -324,7 +324,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pc5" function="SPI" group="MOSI" field="SPI"/>
@@ -337,10 +337,10 @@
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="lcd" name="LCD" module-key="i3003">
-            <register-group-instance key="lcd" name="LCD" register-group-key="lcd" address-space-key="data" offset="0xD00"/>
+            <register-group-instance register-group-key="lcd" address-space-key="data" offset="0xD00"/>
             <signals>
                 <signal pad-id="pg0" index="24" function="LCD_SEG" group="SEG"/>
                 <signal pad-id="pg1" index="23" function="LCD_SEG" group="SEG"/>
@@ -388,10 +388,10 @@
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6570_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i3600">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64C3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64C3.xml
index 95556a7c..30a22406 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64C3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64C3.xml
@@ -60,37 +60,37 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="i6075_vport">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="i6075_vport">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="i6075_vport">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="i6075_vport">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
             <signals>
                 <signal pad-id="pr0" function="XTAL" group="XTAL2"/>
                 <signal pad-id="pr1" function="XTAL" group="XTAL1"/>
@@ -99,25 +99,25 @@
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
@@ -127,16 +127,16 @@
             </signals>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6110">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -159,7 +159,7 @@
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pa1" index="1" function="AC" group="AC"/>
@@ -174,31 +174,31 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWI" group="SDA"/>
                 <signal pad-id="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pe0" function="TWI" group="SDA"/>
                 <signal pad-id="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
-            <register-group-instance key="usb" name="USB" register-group-key="usb" address-space-key="data" offset="0x4C0"/>
+            <register-group-instance register-group-key="usb" address-space-key="data" offset="0x4C0"/>
             <signals>
                 <signal pad-id="pd6" function="USB" group="DN"/>
                 <signal pad-id="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -211,7 +211,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -224,7 +224,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -237,7 +237,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -250,7 +250,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -263,7 +263,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -276,14 +276,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pc1" function="TC0" group="OC0B" field="TC0B"/>
@@ -296,14 +296,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TC1" group="OC1A"/>
                 <signal pad-id="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC0" group="OC0A"/>
                 <signal pad-id="pd1" function="TC0" group="OC0B"/>
@@ -312,7 +312,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC0" group="OC0A"/>
                 <signal pad-id="pe1" function="TC0" group="OC0B"/>
@@ -321,7 +321,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
-            <register-group-instance key="tcf0" name="TCF0" register-group-key="tc0" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TC0" group="OC0A"/>
                 <signal pad-id="pf1" function="TC0" group="OC0B"/>
@@ -330,7 +330,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
-            <register-group-instance key="tcc2" name="TCC2" register-group-key="tc2" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pc1" function="TC2" group="LOC2B"/>
@@ -343,7 +343,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
-            <register-group-instance key="tcd2" name="TCD2" register-group-key="tc2" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pd1" function="TC2" group="LOC2B"/>
@@ -356,7 +356,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
-            <register-group-instance key="tce2" name="TCE2" register-group-key="tc2" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pe1" function="TC2" group="LOC2B"/>
@@ -369,7 +369,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
-            <register-group-instance key="tcf2" name="TCF2" register-group-key="tc2" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pf1" function="TC2" group="LOC2B"/>
@@ -382,7 +382,7 @@
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pc0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pc1" function="AWEX" group="OC0AHS"/>
@@ -395,10 +395,10 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pc2" function="USART" group="RXD" field="USART0"/>
@@ -409,7 +409,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
             <signals>
                 <signal pad-id="pd1" function="USART" group="XCK"/>
                 <signal pad-id="pd2" function="USART" group="RXD"/>
@@ -417,7 +417,7 @@
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
             <signals>
                 <signal pad-id="pe1" function="USART" group="XCK"/>
                 <signal pad-id="pe2" function="USART" group="RXD"/>
@@ -425,7 +425,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pc5" function="SPI" group="MOSI" field="SPI"/>
@@ -438,7 +438,7 @@
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
             <signals>
                 <signal pad-id="pd4" function="SPI" group="SS"/>
                 <signal pad-id="pd5" function="SPI" group="MOSI"/>
@@ -447,16 +447,16 @@
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6570_fuse">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6570_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i3610">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64D3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64D3.xml
index 704b8296..208c24a4 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64D3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64D3.xml
@@ -61,25 +61,25 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
             <signals>
                 <signal pad-id="pr0" function="XTAL" group="XTAL2"/>
                 <signal pad-id="pr1" function="XTAL" group="XTAL1"/>
@@ -88,43 +88,43 @@
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6076">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6076">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i6076">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pa1" index="1" function="AC" group="AC"/>
@@ -139,7 +139,7 @@
             </signals>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6110">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -162,24 +162,24 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWI" group="SDA"/>
                 <signal pad-id="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pe0" function="TWI" group="SDA"/>
                 <signal pad-id="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="port_cfg" name="PORT_CFG" module-key="gpio_port">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
@@ -189,19 +189,19 @@
             </signals>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="gpio_port">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="gpio_port">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="gpio_port">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="gpio_port">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -214,7 +214,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -227,7 +227,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -240,7 +240,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -253,7 +253,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -266,7 +266,7 @@
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
-            <register-group-instance key="portf" name="PORTF" register-group-key="port" address-space-key="data" offset="0x6A0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x6A0"/>
             <signals>
                 <signal pad-id="pf0" index="0" function="PORTF" group="P"/>
                 <signal pad-id="pf1" index="1" function="PORTF" group="P"/>
@@ -279,14 +279,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC0" group="OC0A" field="TC0A"/>
                 <signal pad-id="pc1" function="TC0" group="OC0B" field="TC0B"/>
@@ -299,14 +299,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TC1" group="OC1A"/>
                 <signal pad-id="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_tc">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pc0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pc1" function="AWEX" group="OC0AHS"/>
@@ -319,10 +319,10 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_tc">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC0" group="OC0A"/>
                 <signal pad-id="pd1" function="TC0" group="OC0B"/>
@@ -331,7 +331,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC0" group="OC0A"/>
                 <signal pad-id="pe1" function="TC0" group="OC0B"/>
@@ -340,10 +340,10 @@
             </signals>
         </peripheral>
         <peripheral key="awexe" name="AWEXE" module-key="i6090_tc">
-            <register-group-instance key="awexe" name="AWEXE" register-group-key="awex" address-space-key="data" offset="0xA80"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0xA80"/>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
-            <register-group-instance key="tcf0" name="TCF0" register-group-key="tc0" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TC0" group="OC0A"/>
                 <signal pad-id="pf1" function="TC0" group="OC0B"/>
@@ -352,7 +352,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
-            <register-group-instance key="tcc2" name="TCC2" register-group-key="tc2" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pc1" function="TC2" group="LOC2B"/>
@@ -365,7 +365,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
-            <register-group-instance key="tcd2" name="TCD2" register-group-key="tc2" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pd1" function="TC2" group="LOC2B"/>
@@ -378,7 +378,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
-            <register-group-instance key="tce2" name="TCE2" register-group-key="tc2" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pe1" function="TC2" group="LOC2B"/>
@@ -391,7 +391,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
-            <register-group-instance key="tcf2" name="TCF2" register-group-key="tc2" address-space-key="data" offset="0xB00"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0xB00"/>
             <signals>
                 <signal pad-id="pf0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pf1" function="TC2" group="LOC2B"/>
@@ -404,7 +404,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pc2" function="USART" group="RXD" field="USART0"/>
@@ -415,7 +415,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
             <signals>
                 <signal pad-id="pd1" function="USART" group="XCK"/>
                 <signal pad-id="pd2" function="USART" group="RXD"/>
@@ -423,7 +423,7 @@
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
-            <register-group-instance key="usarte0" name="USARTE0" register-group-key="usart" address-space-key="data" offset="0xAA0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0xAA0"/>
             <signals>
                 <signal pad-id="pe1" function="USART" group="XCK"/>
                 <signal pad-id="pe2" function="USART" group="RXD"/>
@@ -431,7 +431,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pc5" function="SPI" group="MOSI" field="SPI"/>
@@ -444,7 +444,7 @@
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
             <signals>
                 <signal pad-id="pd4" function="SPI" group="SS"/>
                 <signal pad-id="pd5" function="SPI" group="MOSI"/>
@@ -453,10 +453,10 @@
             </signals>
         </peripheral>
         <peripheral key="spie" name="SPIE" module-key="i6090_spi">
-            <register-group-instance key="spie" name="SPIE" register-group-key="spi" address-space-key="data" offset="0xAC0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0xAC0"/>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64D4.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64D4.xml
index aae54864..c389457f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64D4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64D4.xml
@@ -60,37 +60,37 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="i6075_vport">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="i6075_vport">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="i6075_vport">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="i6075_vport">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
             <signals>
                 <signal pad-id="pr0" function="XTAL" group="XTAL2"/>
                 <signal pad-id="pr1" function="XTAL" group="XTAL1"/>
@@ -101,25 +101,25 @@
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="dfllrc2m" name="DFLLRC2M" module-key="i6055">
-            <register-group-instance key="dfllrc2m" name="DFLLRC2M" register-group-key="dfll" address-space-key="data" offset="0x68"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x68"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
@@ -129,16 +129,16 @@
             </signals>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i6076">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6110">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -157,7 +157,7 @@
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pa1" index="1" function="AC" group="AC"/>
@@ -171,24 +171,24 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWI" group="SDA"/>
                 <signal pad-id="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
-            <register-group-instance key="twie" name="TWIE" register-group-key="twi" address-space-key="data" offset="0x4A0"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x4A0"/>
             <signals>
                 <signal pad-id="pe0" function="TWI" group="SDA"/>
                 <signal pad-id="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -201,7 +201,7 @@
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
-            <register-group-instance key="portb" name="PORTB" register-group-key="port" address-space-key="data" offset="0x620"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x620"/>
             <signals>
                 <signal pad-id="pb0" index="0" function="PORTB" group="P"/>
                 <signal pad-id="pb1" index="1" function="PORTB" group="P"/>
@@ -210,7 +210,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -223,7 +223,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -236,7 +236,7 @@
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
-            <register-group-instance key="porte" name="PORTE" register-group-key="port" address-space-key="data" offset="0x680"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x680"/>
             <signals>
                 <signal pad-id="pe0" index="0" function="PORTE" group="P"/>
                 <signal pad-id="pe1" index="1" function="PORTE" group="P"/>
@@ -245,14 +245,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
-            <register-group-instance key="tcc0" name="TCC0" register-group-key="tc0" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TCC" group="OC0A" field="TC0A"/>
                 <signal pad-id="pc1" function="TCC" group="OC0B" field="TC0B"/>
@@ -265,14 +265,14 @@
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
-            <register-group-instance key="tcc1" name="TCC1" register-group-key="tc1" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc1" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TCC" group="OC1A"/>
                 <signal pad-id="pc5" function="TCC" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
-            <register-group-instance key="tcd0" name="TCD0" register-group-key="tc0" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TCC" group="OC0A"/>
                 <signal pad-id="pd1" function="TCC" group="OC0B"/>
@@ -281,7 +281,7 @@
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
-            <register-group-instance key="tce0" name="TCE0" register-group-key="tc0" address-space-key="data" offset="0xA00"/>
+            <register-group-instance register-group-key="tc0" address-space-key="data" offset="0xA00"/>
             <signals>
                 <signal pad-id="pe0" function="TCE" group="OC0A"/>
                 <signal pad-id="pe1" function="TCE" group="OC0B"/>
@@ -290,7 +290,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
-            <register-group-instance key="tcc2" name="TCC2" register-group-key="tc2" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TCC2" group="LOC2A"/>
                 <signal pad-id="pc1" function="TCC2" group="LOC2B"/>
@@ -303,7 +303,7 @@
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
-            <register-group-instance key="tcd2" name="TCD2" register-group-key="tc2" address-space-key="data" offset="0x900"/>
+            <register-group-instance register-group-key="tc2" address-space-key="data" offset="0x900"/>
             <signals>
                 <signal pad-id="pd0" function="TC2" group="LOC2A"/>
                 <signal pad-id="pd1" function="TC2" group="LOC2B"/>
@@ -316,7 +316,7 @@
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
-            <register-group-instance key="awexc" name="AWEXC" register-group-key="awex" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="awex" address-space-key="data" offset="0x880"/>
             <signals>
                 <signal pad-id="pc0" function="AWEX" group="OC0ALS"/>
                 <signal pad-id="pc1" function="AWEX" group="OC0AHS"/>
@@ -329,10 +329,10 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pc2" function="USART" group="RXD" field="USART0"/>
@@ -343,7 +343,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9A0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9A0"/>
             <signals>
                 <signal pad-id="pd1" function="USART" group="XCK"/>
                 <signal pad-id="pd2" function="USART" group="RXD"/>
@@ -351,7 +351,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc4" function="SPI" group="SS" field="SPI"/>
                 <signal pad-id="pc5" function="SPI" group="MOSI" field="SPI"/>
@@ -364,7 +364,7 @@
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
-            <register-group-instance key="spid" name="SPID" register-group-key="spi" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x9C0"/>
             <signals>
                 <signal pad-id="pd4" function="SPI" group="SS"/>
                 <signal pad-id="pd5" function="SPI" group="MOSI"/>
@@ -373,16 +373,16 @@
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6570_fuse">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i6570_lockbit">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i6570_sigrow">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA8E5.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA8E5.xml
index 6f8f5cd4..34e7b4c8 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA8E5.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA8E5.xml
@@ -60,40 +60,40 @@
     </physical-interfaces>
     <peripherals>
         <peripheral key="gpio" name="GPIO" module-key="i6085">
-            <register-group-instance key="gpio" name="GPIO" register-group-key="gpio" address-space-key="data" offset="0x0"/>
+            <register-group-instance register-group-key="gpio" address-space-key="data" offset="0x0"/>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="i6075_vport">
-            <register-group-instance key="vport0" name="VPORT0" register-group-key="vport" address-space-key="data" offset="0x10"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x10"/>
         </peripheral>
         <peripheral key="vport1" name="VPORT1" module-key="i6075_vport">
-            <register-group-instance key="vport1" name="VPORT1" register-group-key="vport" address-space-key="data" offset="0x14"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x14"/>
         </peripheral>
         <peripheral key="vport2" name="VPORT2" module-key="i6075_vport">
-            <register-group-instance key="vport2" name="VPORT2" register-group-key="vport" address-space-key="data" offset="0x18"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x18"/>
         </peripheral>
         <peripheral key="vport3" name="VPORT3" module-key="i6075_vport">
-            <register-group-instance key="vport3" name="VPORT3" register-group-key="vport" address-space-key="data" offset="0x1C"/>
+            <register-group-instance register-group-key="vport" address-space-key="data" offset="0x1C"/>
         </peripheral>
         <peripheral key="ocd" name="OCD" module-key="i6043">
-            <register-group-instance key="ocd" name="OCD" register-group-key="ocd" address-space-key="data" offset="0x2E"/>
+            <register-group-instance register-group-key="ocd" address-space-key="data" offset="0x2E"/>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i6000">
-            <register-group-instance key="cpu" name="CPU" register-group-key="cpu" address-space-key="data" offset="0x30"/>
+            <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
         </peripheral>
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
-            <register-group-instance key="clk" name="CLK" register-group-key="clk" address-space-key="data" offset="0x40"/>
+            <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
             <signals>
                 <signal pad-id="pc4" function="EXTERNAL_CLOCK" group="EXTCLK"/>
             </signals>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
-            <register-group-instance key="pr" name="PR" register-group-key="pr" address-space-key="data" offset="0x70"/>
+            <register-group-instance register-group-key="pr" address-space-key="data" offset="0x70"/>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
-            <register-group-instance key="sleep" name="SLEEP" register-group-key="sleep" address-space-key="data" offset="0x48"/>
+            <register-group-instance register-group-key="sleep" address-space-key="data" offset="0x48"/>
         </peripheral>
         <peripheral key="osc" name="OSC" module-key="i6079">
-            <register-group-instance key="osc" name="OSC" register-group-key="osc" address-space-key="data" offset="0x50"/>
+            <register-group-instance register-group-key="osc" address-space-key="data" offset="0x50"/>
             <signals>
                 <signal pad-id="pr0" function="XTAL" group="XTAL2"/>
                 <signal pad-id="pr1" function="XTAL" group="XTAL1"/>
@@ -102,22 +102,22 @@
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
-            <register-group-instance key="dfllrc32m" name="DFLLRC32M" register-group-key="dfll" address-space-key="data" offset="0x60"/>
+            <register-group-instance register-group-key="dfll" address-space-key="data" offset="0x60"/>
         </peripheral>
         <peripheral key="rst" name="RST" module-key="i6083">
-            <register-group-instance key="rst" name="RST" register-group-key="rst" address-space-key="data" offset="0x78"/>
+            <register-group-instance register-group-key="rst" address-space-key="data" offset="0x78"/>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="i6078">
-            <register-group-instance key="wdt" name="WDT" register-group-key="wdt" address-space-key="data" offset="0x80"/>
+            <register-group-instance register-group-key="wdt" address-space-key="data" offset="0x80"/>
         </peripheral>
         <peripheral key="mcu" name="MCU" module-key="i6091">
-            <register-group-instance key="mcu" name="MCU" register-group-key="mcu" address-space-key="data" offset="0x90"/>
+            <register-group-instance register-group-key="mcu" address-space-key="data" offset="0x90"/>
         </peripheral>
         <peripheral key="pmic" name="PMIC" module-key="i6057">
-            <register-group-instance key="pmic" name="PMIC" register-group-key="pmic" address-space-key="data" offset="0xA0"/>
+            <register-group-instance register-group-key="pmic" address-space-key="data" offset="0xA0"/>
         </peripheral>
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
-            <register-group-instance key="portcfg" name="PORTCFG" register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
+            <register-group-instance register-group-key="portcfg" address-space-key="data" offset="0xB0"/>
             <signals>
                 <signal pad-id="pd7" function="CLKOUTD" group="CLKOUT" field="CLKOUT"/>
                 <signal pad-id="pd4" function="CLKOUTD_ALT" group="CLKOUT" field="CLKEVPIN"/>
@@ -130,19 +130,19 @@
             </signals>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
-            <register-group-instance key="crc" name="CRC" register-group-key="crc" address-space-key="data" offset="0xD0"/>
+            <register-group-instance register-group-key="crc" address-space-key="data" offset="0xD0"/>
         </peripheral>
         <peripheral key="edma" name="EDMA" module-key="i3002">
-            <register-group-instance key="edma" name="EDMA" register-group-key="edma" address-space-key="data" offset="0x100"/>
+            <register-group-instance register-group-key="edma" address-space-key="data" offset="0x100"/>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i6061">
-            <register-group-instance key="evsys" name="EVSYS" register-group-key="evsys" address-space-key="data" offset="0x180"/>
+            <register-group-instance register-group-key="evsys" address-space-key="data" offset="0x180"/>
         </peripheral>
         <peripheral key="nvm" name="NVM" module-key="i3620_nvm">
-            <register-group-instance key="nvm" name="NVM" register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
+            <register-group-instance register-group-key="nvm" address-space-key="data" offset="0x1C0"/>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6110">
-            <register-group-instance key="adca" name="ADCA" register-group-key="adc" address-space-key="data" offset="0x200"/>
+            <register-group-instance register-group-key="adc" address-space-key="data" offset="0x200"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="ADC" group="ADC"/>
                 <signal pad-id="pa1" index="1" function="ADC" group="ADC"/>
@@ -165,7 +165,7 @@
             </signals>
         </peripheral>
         <peripheral key="daca" name="DACA" module-key="i6059">
-            <register-group-instance key="daca" name="DACA" register-group-key="dac" address-space-key="data" offset="0x300"/>
+            <register-group-instance register-group-key="dac" address-space-key="data" offset="0x300"/>
             <signals>
                 <signal pad-id="pa2" index="0" function="DAC" group="DAC"/>
                 <signal pad-id="pa3" index="1" function="DAC" group="DAC"/>
@@ -174,7 +174,7 @@
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
-            <register-group-instance key="aca" name="ACA" register-group-key="ac" address-space-key="data" offset="0x380"/>
+            <register-group-instance register-group-key="ac" address-space-key="data" offset="0x380"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="AC" group="AC"/>
                 <signal pad-id="pa1" index="1" function="AC" group="AC"/>
@@ -195,10 +195,10 @@
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
-            <register-group-instance key="rtc" name="RTC" register-group-key="rtc" address-space-key="data" offset="0x400"/>
+            <register-group-instance register-group-key="rtc" address-space-key="data" offset="0x400"/>
         </peripheral>
         <peripheral key="xcl" name="XCL" module-key="i3008">
-            <register-group-instance key="xcl" name="XCL" register-group-key="xcl" address-space-key="data" offset="0x460"/>
+            <register-group-instance register-group-key="xcl" address-space-key="data" offset="0x460"/>
             <signals>
                 <signal pad-id="pc0" index="1" function="XCLIN_LSB_PC" group="IN"/>
                 <signal pad-id="pc1" index="2" function="XCLIN_LSB_PC" group="IN"/>
@@ -225,7 +225,7 @@
             </signals>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
-            <register-group-instance key="twic" name="TWIC" register-group-key="twi" address-space-key="data" offset="0x480"/>
+            <register-group-instance register-group-key="twi" address-space-key="data" offset="0x480"/>
             <signals>
                 <signal pad-id="pc0" function="TWI" group="SDA"/>
                 <signal pad-id="pc1" function="TWI" group="SCL"/>
@@ -234,7 +234,7 @@
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
-            <register-group-instance key="porta" name="PORTA" register-group-key="port" address-space-key="data" offset="0x600"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x600"/>
             <signals>
                 <signal pad-id="pa0" index="0" function="PORTA" group="P"/>
                 <signal pad-id="pa1" index="1" function="PORTA" group="P"/>
@@ -247,7 +247,7 @@
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
-            <register-group-instance key="portc" name="PORTC" register-group-key="port" address-space-key="data" offset="0x640"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x640"/>
             <signals>
                 <signal pad-id="pc0" index="0" function="PORTC" group="P"/>
                 <signal pad-id="pc1" index="1" function="PORTC" group="P"/>
@@ -260,7 +260,7 @@
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
-            <register-group-instance key="portd" name="PORTD" register-group-key="port" address-space-key="data" offset="0x660"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x660"/>
             <signals>
                 <signal pad-id="pd0" index="0" function="PORTD" group="P"/>
                 <signal pad-id="pd1" index="1" function="PORTD" group="P"/>
@@ -273,14 +273,14 @@
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
-            <register-group-instance key="portr" name="PORTR" register-group-key="port" address-space-key="data" offset="0x7E0"/>
+            <register-group-instance register-group-key="port" address-space-key="data" offset="0x7E0"/>
             <signals>
                 <signal pad-id="pr0" index="0" function="PORTR" group="P"/>
                 <signal pad-id="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc4" name="TCC4" module-key="i3007_tc">
-            <register-group-instance key="tcc4" name="TCC4" register-group-key="tc4" address-space-key="data" offset="0x800"/>
+            <register-group-instance register-group-key="tc4" address-space-key="data" offset="0x800"/>
             <signals>
                 <signal pad-id="pc0" function="TC4" group="OC4A" field="TC4A"/>
                 <signal pad-id="pc1" function="TC4" group="OC4B" field="TC4B"/>
@@ -293,27 +293,27 @@
             </signals>
         </peripheral>
         <peripheral key="tcc5" name="TCC5" module-key="i3007_tc">
-            <register-group-instance key="tcc5" name="TCC5" register-group-key="tc5" address-space-key="data" offset="0x840"/>
+            <register-group-instance register-group-key="tc5" address-space-key="data" offset="0x840"/>
             <signals>
                 <signal pad-id="pc4" function="TC5" group="OC5A"/>
                 <signal pad-id="pc5" function="TC5" group="OC5B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd5" name="TCD5" module-key="i3007_tc">
-            <register-group-instance key="tcd5" name="TCD5" register-group-key="tc5" address-space-key="data" offset="0x940"/>
+            <register-group-instance register-group-key="tc5" address-space-key="data" offset="0x940"/>
             <signals>
                 <signal pad-id="pd4" function="TC5" group="OC5A"/>
                 <signal pad-id="pd5" function="TC5" group="OC5B"/>
             </signals>
         </peripheral>
         <peripheral key="faultc4" name="FAULTC4" module-key="i3620_fault">
-            <register-group-instance key="faultc4" name="FAULTC4" register-group-key="fault" address-space-key="data" offset="0x880"/>
+            <register-group-instance register-group-key="fault" address-space-key="data" offset="0x880"/>
         </peripheral>
         <peripheral key="faultc5" name="FAULTC5" module-key="i3620_fault">
-            <register-group-instance key="faultc5" name="FAULTC5" register-group-key="fault" address-space-key="data" offset="0x890"/>
+            <register-group-instance register-group-key="fault" address-space-key="data" offset="0x890"/>
         </peripheral>
         <peripheral key="wexc" name="WEXC" module-key="i3007_wex">
-            <register-group-instance key="wexc" name="WEXC" register-group-key="wex" address-space-key="data" offset="0x8A0"/>
+            <register-group-instance register-group-key="wex" address-space-key="data" offset="0x8A0"/>
             <signals>
                 <signal pad-id="pc0" function="WEX" group="OC4ALS"/>
                 <signal pad-id="pc1" function="WEX" group="OC4AHS"/>
@@ -326,10 +326,10 @@
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i3620_hires">
-            <register-group-instance key="hiresc" name="HIRESC" register-group-key="hires" address-space-key="data" offset="0x8B0"/>
+            <register-group-instance register-group-key="hires" address-space-key="data" offset="0x8B0"/>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i4000">
-            <register-group-instance key="usartc0" name="USARTC0" register-group-key="usart" address-space-key="data" offset="0x8C0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x8C0"/>
             <signals>
                 <signal pad-id="pc1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pc2" function="USART" group="RXD" field="USART0"/>
@@ -340,7 +340,7 @@
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i4000">
-            <register-group-instance key="usartd0" name="USARTD0" register-group-key="usart" address-space-key="data" offset="0x9C0"/>
+            <register-group-instance register-group-key="usart" address-space-key="data" offset="0x9C0"/>
             <signals>
                 <signal pad-id="pd1" function="USART" group="XCK" field="USART0"/>
                 <signal pad-id="pd2" function="USART" group="RXD" field="USART0"/>
@@ -351,7 +351,7 @@
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
-            <register-group-instance key="spic" name="SPIC" register-group-key="spi" address-space-key="data" offset="0x8E0"/>
+            <register-group-instance register-group-key="spi" address-space-key="data" offset="0x8E0"/>
             <signals>
                 <signal pad-id="pc4" function="SPI" group="SS"/>
                 <signal pad-id="pc5" function="SPI" group="SCK"/>
@@ -360,16 +360,16 @@
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
-            <register-group-instance key="ircom" name="IRCOM" register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
+            <register-group-instance register-group-key="ircom" address-space-key="data" offset="0x8F8"/>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i3620_fuse">
             <register-group-instance key="fuse" name="FUSE" register-group-key="nvm_fuses" address-space-key="fuses" offset="0x0"/>
         </peripheral>
         <peripheral key="lockbit" name="LOCKBIT" module-key="i3620_fuse">
-            <register-group-instance key="lockbit" name="LOCKBIT" register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_lockbits" address-space-key="lockbits" offset="0x0"/>
         </peripheral>
         <peripheral key="prod_signatures" name="PROD_SIGNATURES" module-key="i3620_sigrow">
-            <register-group-instance key="prod_signatures" name="PROD_SIGNATURES" register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
+            <register-group-instance register-group-key="nvm_prod_signatures" address-space-key="prod_signatures" offset="0x0"/>
         </peripheral>
     </peripherals>
     <modules>